Merge branch 'master' into proposal-dashboard

This commit is contained in:
decabeza
2019-03-27 17:56:46 +01:00
138 changed files with 639 additions and 639 deletions

View File

@@ -48,7 +48,7 @@ shared_examples "relationable" do |relationable_model_name|
end
within("#related_content") do
fill_in 'url', with: "#{Setting['url'] + related2.url}"
fill_in "url", with: "#{Setting["url"] + related2.url}"
click_button "Add"
end
@@ -78,7 +78,7 @@ shared_examples "relationable" do |relationable_model_name|
click_on("Add related content")
within("#related_content") do
fill_in 'url', with: Setting[:url] + relationable.url.to_s
fill_in "url", with: Setting[:url] + relationable.url.to_s
click_button "Add"
end