Use have_current_path instead of include

Using `have_current_path`, Capybara waits until the condition is true,
while using `include` the expectation is evaluated immediately and so
tests might fail when using a driver supporting JavaScript.

Besides, using `have_current_path` the error message is more readable
when the test fails.

spec/system/admin/hidden_budget_investments_spec.rb

@@ -86,7 +86,7 @@ describe "Admin hidden budget investments", :admin do
 
     click_on("Restore", match: :first, exact: true)
 
-    expect(current_url).to include("filter=with_confirmed_hide")
+    expect(page).to have_current_path(/filter=with_confirmed_hide/)
-    expect(current_url).to include("page=2")
+    expect(page).to have_current_path(/page=2/)
   end
 end

spec/system/admin/hidden_comments_spec.rb

@@ -127,7 +127,7 @@ describe "Admin hidden comments", :admin do
 
     click_on("Restore", match: :first, exact: true)
 
-    expect(current_url).to include("filter=with_confirmed_hide")
+    expect(page).to have_current_path(/filter=with_confirmed_hide/)
-    expect(current_url).to include("page=2")
+    expect(page).to have_current_path(/page=2/)
   end
 end

spec/system/admin/hidden_debates_spec.rb

@@ -73,7 +73,7 @@ describe "Admin hidden debates", :admin do
 
     click_on("Restore", match: :first, exact: true)
 
-    expect(current_url).to include("filter=with_confirmed_hide")
+    expect(page).to have_current_path(/filter=with_confirmed_hide/)
-    expect(current_url).to include("page=2")
+    expect(page).to have_current_path(/page=2/)
   end
 end

spec/system/admin/hidden_proposals_spec.rb

@@ -83,7 +83,7 @@ describe "Admin hidden proposals", :admin do
 
     click_on("Restore", match: :first, exact: true)
 
-    expect(current_url).to include("filter=with_confirmed_hide")
+    expect(page).to have_current_path(/filter=with_confirmed_hide/)
-    expect(current_url).to include("page=2")
+    expect(page).to have_current_path(/page=2/)
   end
 end

spec/system/admin/hidden_users_spec.rb

@@ -84,7 +84,7 @@ describe "Admin hidden users", :admin do
 
     click_on("Restore", match: :first, exact: true)
 
-    expect(current_url).to include("filter=with_confirmed_hide")
+    expect(page).to have_current_path(/filter=with_confirmed_hide/)
-    expect(current_url).to include("page=2")
+    expect(page).to have_current_path(/page=2/)
   end
 end

spec/system/admin/organizations_spec.rb

@@ -210,7 +210,7 @@ describe "Admin::Organizations" do
 
     click_on("Verify", match: :first)
 
-    expect(current_url).to include("filter=pending")
+    expect(page).to have_current_path(/filter=pending/)
-    expect(current_url).to include("page=2")
+    expect(page).to have_current_path(/page=2/)
   end
 end

spec/system/admin/proposal_notifications_spec.rb

@@ -82,7 +82,7 @@ describe "Admin proposal notifications", :admin do
 
     click_on("Restore", match: :first, exact: true)
 
-    expect(current_url).to include("filter=with_confirmed_hide")
+    expect(page).to have_current_path(/filter=with_confirmed_hide/)
-    expect(current_url).to include("page=2")
+    expect(page).to have_current_path(/page=2/)
   end
 end

spec/system/budgets/investments_spec.rb

@@ -372,8 +372,8 @@ describe "Budget Investments" do
         expect(medium_proposal.title).to appear_before(worst_proposal.title)
       end
 
-      expect(current_url).to include("order=confidence_score")
+      expect(page).to have_current_path(/order=confidence_score/)
-      expect(current_url).to include("page=1")
+      expect(page).to have_current_path(/page=1/)
     end
 
     scenario "Each user has a different and consistent random budget investment order" do
@@ -1192,8 +1192,8 @@ describe "Budget Investments" do
         expect(mid_investment.title).to appear_before(low_investment.title)
       end
 
-      expect(current_url).to include("order=price")
+      expect(page).to have_current_path(/order=price/)
-      expect(current_url).to include("page=1")
+      expect(page).to have_current_path(/page=1/)
     end
 
     scenario "Show" do

spec/system/debates_spec.rb

@@ -408,8 +408,8 @@ describe "Debates" do
         expect(medium_debate.title).to appear_before(worst_debate.title)
       end
 
-      expect(current_url).to include("order=confidence_score")
+      expect(page).to have_current_path(/order=confidence_score/)
-      expect(current_url).to include("page=1")
+      expect(page).to have_current_path(/page=1/)
     end
 
     scenario "Debates are ordered by newest", :js do
@@ -427,8 +427,8 @@ describe "Debates" do
         expect(medium_debate.title).to appear_before(worst_debate.title)
       end
 
-      expect(current_url).to include("order=created_at")
+      expect(page).to have_current_path(/order=created_at/)
-      expect(current_url).to include("page=1")
+      expect(page).to have_current_path(/page=1/)
     end
 
     context "Recommendations" do
@@ -494,8 +494,8 @@ describe "Debates" do
           expect(medium_debate.title).to appear_before(worst_debate.title)
         end
 
-        expect(current_url).to include("order=recommendations")
+        expect(page).to have_current_path(/order=recommendations/)
-        expect(current_url).to include("page=1")
+        expect(page).to have_current_path(/page=1/)
       end
 
       scenario "are not shown if account setting is disabled" do

spec/system/management/proposals_spec.rb

@@ -214,8 +214,8 @@ describe "Proposals" do
 
       expect(page).to have_selector(".js-order-selector[data-order='created_at']")
 
-      expect(current_url).to include("order=created_at")
+      expect(page).to have_current_path(/order=created_at/)
-      expect(current_url).to include("page=1")
+      expect(page).to have_current_path(/page=1/)
 
       within(".proposals-list") do
         expect(medium_proposal.title).to appear_before(best_proposal.title)

spec/system/moderation/budget_investments_spec.rb

@@ -121,9 +121,9 @@ describe "Moderate budget investments" do
 
         expect(page).to have_selector(".js-order-selector[data-order='created_at']")
 
-        expect(current_url).to include("filter=all")
+        expect(page).to have_current_path(/filter=all/)
-        expect(current_url).to include("page=2")
+        expect(page).to have_current_path(/page=2/)
-        expect(current_url).to include("order=created_at")
+        expect(page).to have_current_path(/order=created_at/)
       end
     end
 

spec/system/moderation/comments_spec.rb

@@ -134,9 +134,9 @@ describe "Moderate comments" do
 
         expect(page).to have_selector(".js-order-selector[data-order='newest']")
 
-        expect(current_url).to include("filter=all")
+        expect(page).to have_current_path(/filter=all/)
-        expect(current_url).to include("page=2")
+        expect(page).to have_current_path(/page=2/)
-        expect(current_url).to include("order=newest")
+        expect(page).to have_current_path(/order=newest/)
       end
     end
 

spec/system/moderation/debates_spec.rb

@@ -107,9 +107,9 @@ describe "Moderate debates" do
 
         expect(page).to have_selector(".js-order-selector[data-order='created_at']")
 
-        expect(current_url).to include("filter=all")
+        expect(page).to have_current_path(/filter=all/)
-        expect(current_url).to include("page=2")
+        expect(page).to have_current_path(/page=2/)
-        expect(current_url).to include("order=created_at")
+        expect(page).to have_current_path(/order=created_at/)
       end
     end
 

spec/system/moderation/proposal_notifications_spec.rb

@@ -110,9 +110,9 @@ describe "Moderate proposal notifications" do
 
         expect(page).to have_selector(".js-order-selector[data-order='created_at']")
 
-        expect(current_url).to include("filter=all")
+        expect(page).to have_current_path(/filter=all/)
-        expect(current_url).to include("page=2")
+        expect(page).to have_current_path(/page=2/)
-        expect(current_url).to include("order=created_at")
+        expect(page).to have_current_path(/order=created_at/)
       end
     end
 

spec/system/moderation/proposals_spec.rb

@@ -106,9 +106,9 @@ describe "Moderate proposals" do
 
         expect(page).to have_selector(".js-order-selector[data-order='created_at']")
 
-        expect(current_url).to include("filter=all")
+        expect(page).to have_current_path(/filter=all/)
-        expect(current_url).to include("page=2")
+        expect(page).to have_current_path(/page=2/)
-        expect(current_url).to include("order=created_at")
+        expect(page).to have_current_path(/order=created_at/)
       end
     end
 

spec/system/notifications_spec.rb

@@ -155,7 +155,8 @@ describe "Notifications" do
       expect(page).to have_content("Notification body")
 
       first("#notification_#{notification.id} a").click
-      expect(page.current_url).to eq("https://www.external.link.dev/")
+
+      expect(page).to have_current_path "https://www.external.link.dev/", url: true
     end
 
     scenario "With internal link", :js do

spec/system/proposals_spec.rb

@@ -812,8 +812,8 @@ describe "Proposals" do
         expect(medium_proposal.title).to appear_before(worst_proposal.title)
       end
 
-      expect(current_url).to include("order=confidence_score")
+      expect(page).to have_current_path(/order=confidence_score/)
-      expect(current_url).to include("page=1")
+      expect(page).to have_current_path(/page=1/)
     end
 
     scenario "Proposals are ordered by newest", :js do
@@ -830,8 +830,8 @@ describe "Proposals" do
         expect(medium_proposal.title).to appear_before(worst_proposal.title)
       end
 
-      expect(current_url).to include("order=created_at")
+      expect(page).to have_current_path(/order=created_at/)
-      expect(current_url).to include("page=1")
+      expect(page).to have_current_path(/page=1/)
     end
 
     context "Recommendations" do
@@ -897,8 +897,8 @@ describe "Proposals" do
           expect(medium_proposal.title).to appear_before(worst_proposal.title)
         end
 
-        expect(current_url).to include("order=recommendations")
+        expect(page).to have_current_path(/order=recommendations/)
-        expect(current_url).to include("page=1")
+        expect(page).to have_current_path(/page=1/)
       end
 
       scenario "are not shown if account setting is disabled" do