From e07ae71fff51a3ff8a4001dfa03a0e58d99cf854 Mon Sep 17 00:00:00 2001 From: kikito Date: Thu, 27 Aug 2015 19:05:50 +0200 Subject: [PATCH] Refactors query-parameter-related tests --- spec/features/admin/organizations_spec.rb | 7 ++----- spec/features/moderation/comments_spec.rb | 7 ++----- spec/features/moderation/debates_spec.rb | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/spec/features/admin/organizations_spec.rb b/spec/features/admin/organizations_spec.rb index d13758117..7c1756603 100644 --- a/spec/features/admin/organizations_spec.rb +++ b/spec/features/admin/organizations_spec.rb @@ -119,11 +119,8 @@ feature 'Admin::Organizations' do click_on('Verify', match: :first) - uri = URI.parse(current_url) - query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys - - expect(query_params[:filter]).to eq('pending') - expect(query_params[:page]).to eq('2') + expect(current_url).to include('filter=pending') + expect(current_url).to include('page=2') end end diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb index b78be6967..6c2689f0e 100644 --- a/spec/features/moderation/comments_spec.rb +++ b/spec/features/moderation/comments_spec.rb @@ -151,11 +151,8 @@ feature 'Moderate Comments' do click_link('Ignore', match: :first, exact: true) - uri = URI.parse(current_url) - query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys - - expect(query_params[:filter]).to eq('pending_flag_review') - expect(query_params[:page]).to eq('2') + expect(current_url).to include('filter=pending_flag_review') + expect(current_url).to include('page=2') end feature 'A flagged comment exists' do diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb index 8e3e105b5..60ec2c0cf 100644 --- a/spec/features/moderation/debates_spec.rb +++ b/spec/features/moderation/debates_spec.rb @@ -94,11 +94,8 @@ feature 'Moderate debates' do click_link('Ignore', match: :first, exact: true) - uri = URI.parse(current_url) - query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys - - expect(query_params[:filter]).to eq('pending_flag_review') - expect(query_params[:page]).to eq('2') + expect(current_url).to include('filter=pending_flag_review') + expect(current_url).to include('page=2') end feature 'A flagged debate exists' do