consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify URL validation in related content

Browse Source 
We were using `Setting["url"]` to verify the content belonged to the
application URL, but we can use `root_url` instead.

Note that means we need to include the port when filling in forms in the
tests, since in tests URL helpers like `polymorphic_url` don't include
the port, but a port is automatically added when actually making the
request.
This commit is contained in:
Javi Martín
2022-09-30 02:35:09 +02:00
parent f15f250150
commit adfb141d1b
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spec/shared/system/relationable.rb
View File

@@ -6,7 +6,6 @@ shared_examples "relationable" do |relationable_model_name|
before do
integration_session.host = Capybara.app_host # TODO: remove after upgrading to Rails 6.1
Setting["url"] = Capybara.app_host
end
scenario "related contents are listed" do
@@ -40,7 +39,7 @@ shared_examples "relationable" do |relationable_model_name|
expect(page).to have_css ".add-related-content[aria-expanded='true']"
within("#related_content") do
fill_in "Link to related content", with: polymorphic_url(related1)
fill_in "Link to related content", with: polymorphic_url(related1, port: app_port)
click_button "Add"
end
@@ -57,7 +56,7 @@ shared_examples "relationable" do |relationable_model_name|
click_button "Add related content"
within("#related_content") do
fill_in "Link to related content", with: polymorphic_url(related2)
fill_in "Link to related content", with: polymorphic_url(related2, port: app_port)
click_button "Add"
end
@@ -77,7 +76,7 @@ shared_examples "relationable" do |relationable_model_name|
click_button "Add"
end
expect(page).to have_content "Link not valid. Remember to start with #{Capybara.app_host}."
expect(page).to have_content "Link not valid. Remember to start with #{app_host}/."
end
scenario "returns error when relating content URL to itself" do
@@ -87,7 +86,7 @@ shared_examples "relationable" do |relationable_model_name|
click_button "Add related content"
within("#related_content") do
fill_in "Link to related content", with: polymorphic_url(relationable)
fill_in "Link to related content", with: polymorphic_url(relationable, port: app_port)
click_button "Add"
end
@@ -111,7 +110,7 @@ shared_examples "relationable" do |relationable_model_name|
click_button "Add related content"
within("#related_content") do
fill_in "Link to related content", with: "#{Capybara.app_host}/mypath/#{related.id}"
fill_in "Link to related content", with: "#{app_host}/mypath/#{related.id}"
click_button "Add"
end
@@ -129,7 +128,7 @@ shared_examples "relationable" do |relationable_model_name|
click_button "Add related content"
within("#related_content") do
fill_in "url", with: polymorphic_url(related1)
fill_in "url", with: polymorphic_url(related1, port: app_port)
click_button "Add"
end