From f021aa1ebed399ccc60d554ef5942c793117aba3 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Mon, 20 Nov 2023 12:32:48 +0000 Subject: [PATCH] fixup! lint: Layout/LineLength RuboCop - controller specs --- .../admin_public_body_controller_spec.rb | 36 +++++---- spec/controllers/api_controller_spec.rb | 18 ++--- .../concerns/translatable_params_spec.rb | 14 ++-- spec/controllers/followups_controller_spec.rb | 7 +- spec/controllers/general_controller_spec.rb | 32 ++++---- .../info_request_batch_controller_spec.rb | 7 +- .../public_body_controller_spec.rb | 80 ++++++++++--------- spec/controllers/reports_controller_spec.rb | 20 ++--- spec/controllers/request_controller_spec.rb | 10 +-- .../users/sessions_controller_spec.rb | 14 ++-- 10 files changed, 126 insertions(+), 112 deletions(-) diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 952979b8953..0a134f271b3 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -11,14 +11,14 @@ it "searches for 'humpa'" do get :index, params: { query: "humpa" } - expect(assigns[:public_bodies]) - .to eq([public_bodies(:humpadink_public_body)]) + expect(assigns[:public_bodies]). + to eq([public_bodies(:humpadink_public_body)]) end it "searches for 'humpa' in another locale" do get :index, params: { query: "humpa", locale: "es" } - expect(assigns[:public_bodies]) - .to eq([ public_bodies(:humpadink_public_body) ]) + expect(assigns[:public_bodies]). + to eq([public_bodies(:humpadink_public_body)]) end end @@ -599,13 +599,19 @@ context 'on failure for multiple locales' do before(:each) do - @params = { id: @body.id, - public_body: { name: '', - translations_attributes: { - 'es' => { id: @body.translation_for(:es).id, - locale: 'es', - name: 'Mi Nuevo Body' } - } } } + @params = { + id: @body.id, + public_body: { + name: '', + translations_attributes: { + 'es' => { + id: @body.translation_for(:es).id, + locale: 'es', + name: 'Mi Nuevo Body' + } + } + } + } end it 'is rebuilt with the default locale translation' do @@ -910,12 +916,8 @@ def setup_emergency_credentials(username, password) sign_in users(:admin_user) @request.env["HTTP_AUTHORIZATION"] = "" post :show, params: { id: public_bodies(:humpadink_public_body).id } - expect( - controller. - send(:admin_current_user)). - to eq(users(:admin_user). - url_name - ) + expect(controller.send(:admin_current_user)). + to eq(users(:admin_user).url_name) end it 'returns the REMOTE_USER value from the request environment when skipping admin auth' do diff --git a/spec/controllers/api_controller_spec.rb b/spec/controllers/api_controller_spec.rb index 8bd305ad7ec..ccf70eff69d 100644 --- a/spec/controllers/api_controller_spec.rb +++ b/spec/controllers/api_controller_spec.rb @@ -580,9 +580,9 @@ def _create_request expect(event.info_request.public_body). to eq(public_bodies(:geraldine_public_body)) expect(event.outgoing_message).not_to be_nil - expect(event.event_type).to satisfy { - |x| %w[sent followup_sent resent followup_resent].include?(x) - } + expect(event.event_type).to satisfy do |x| + %w[sent followup_sent resent followup_resent].include?(x) + end end end @@ -600,16 +600,16 @@ def _create_request expect(event.info_request.public_body). to eq(public_bodies(:geraldine_public_body)) expect(event.outgoing_message).not_to be_nil - expect(event.event_type).to satisfy { - |x| %w[sent followup_sent resent followup_resent].include?(x) - } + expect(event.event_type).to satisfy do |x| + %w[sent followup_sent resent followup_resent].include?(x) + end end expect(assigns[:event_data].size).to eq(assigns[:events].size) assigns[:event_data].each do |event_record| - expect(event_record[:event_type]).to satisfy { - |x| %w[sent followup_sent resent followup_resent].include?(x) - } + expect(event_record[:event_type]).to satisfy do |x| + %w[sent followup_sent resent followup_resent].include?(x) + end end end diff --git a/spec/controllers/concerns/translatable_params_spec.rb b/spec/controllers/concerns/translatable_params_spec.rb index 0e6bdef1472..530e9b07b7c 100644 --- a/spec/controllers/concerns/translatable_params_spec.rb +++ b/spec/controllers/concerns/translatable_params_spec.rb @@ -14,13 +14,13 @@ status: 'good', id: 40, translations_attributes: { - en: { - locale: 'en', - name: 'Other name', - bad: "value" + en: { + locale: 'en', + name: 'Other name', + bad: "value" + } } } - } expected = { name: 'Some name', status: 'good', @@ -76,9 +76,9 @@ id: 40, locale: 'en', name: 'Other name' - } } } + } expected = ActionController::Parameters.new(params).permit! params = params = ActionController::Parameters.new(params) @@ -94,9 +94,9 @@ locale: 'en', name: 'Other name', bad: "value" - } } } + } expected = { translations_attributes: { en: { diff --git a/spec/controllers/followups_controller_spec.rb b/spec/controllers/followups_controller_spec.rb index b516f39ab7b..88834049c25 100644 --- a/spec/controllers/followups_controller_spec.rb +++ b/spec/controllers/followups_controller_spec.rb @@ -4,10 +4,9 @@ render_views let(:request_user) { FactoryBot.create(:user) } - let(:request) { FactoryBot.create( - :info_request_with_incoming, - user: request_user - ) } + let(:request) do + FactoryBot.create(:info_request_with_incoming, user: request_user) + end let(:message_id) { request.incoming_messages[0].id } let(:pro_user) { FactoryBot.create(:pro_user) } diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 7504372d0d3..f4b453d014c 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -86,7 +86,7 @@ described_at: Time.zone.now, search_text_main: 'example text') xapian_result = double( - 'xapian result', results: [{model: info_request_event}] + 'xapian result', results: [{ model: info_request_event }] ) allow(controller).to receive(:perform_search).and_return(xapian_result) end @@ -253,12 +253,14 @@ it "should filter results based on end of URL being 'all'" do get :search, params: { combined: "bob/all" } expect(assigns[:xapian_requests].results.map { |x| x[:model] }). - to match_array([ - info_request_events(:useless_outgoing_message_event), - info_request_events(:silly_outgoing_message_event), - info_request_events(:useful_incoming_message_event), - info_request_events(:another_useful_incoming_message_event) - ]) + to match_array( + [ + info_request_events(:useless_outgoing_message_event), + info_request_events(:silly_outgoing_message_event), + info_request_events(:useful_incoming_message_event), + info_request_events(:another_useful_incoming_message_event) + ] + ) expect(assigns[:xapian_users].results.map { |x| x[:model] }). to eq([users(:bob_smith_user)]) expect(assigns[:xapian_bodies].results).to eq([]) @@ -285,13 +287,15 @@ it "should filter results based on end of URL being 'requests'" do get :search, params: { combined: "bob/requests" } - expect(assigns[:xapian_requests].results.map { |x|x[:model] }). - to match_array([ - info_request_events(:useless_outgoing_message_event), - info_request_events(:silly_outgoing_message_event), - info_request_events(:useful_incoming_message_event), - info_request_events(:another_useful_incoming_message_event) - ]) + expect(assigns[:xapian_requests].results.map { |x| x[:model] }). + to match_array( + [ + info_request_events(:useless_outgoing_message_event), + info_request_events(:silly_outgoing_message_event), + info_request_events(:useful_incoming_message_event), + info_request_events(:another_useful_incoming_message_event) + ] + ) expect(assigns[:xapian_users]).to eq(nil) expect(assigns[:xapian_bodies]).to eq(nil) end diff --git a/spec/controllers/info_request_batch_controller_spec.rb b/spec/controllers/info_request_batch_controller_spec.rb index b91038e0658..5f1a82ae290 100644 --- a/spec/controllers/info_request_batch_controller_spec.rb +++ b/spec/controllers/info_request_batch_controller_spec.rb @@ -84,13 +84,14 @@ it 'should assign all info_requests to the view' do with_feature_enabled(:alaveteli_pro) do action - expect(assigns[:info_requests].sort). - to eq([ + expect(assigns[:info_requests].sort).to eq( + [ first_request, second_request, hidden_request, backpage_request - ]) + ] + ) end end end diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 4404649fd72..2daf1406f08 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -27,9 +27,9 @@ it "should assign the requests (1)" do get :show, params: { url_name: "tgq", view: 'all' } conditions = { public_body_id: public_bodies(:geraldine_public_body).id } - actual = assigns[:xapian_requests].results.map { - |x| x[:model].info_request - } + actual = assigns[:xapian_requests].results.map do |x| + x[:model].info_request + end expect(actual).to match_array(InfoRequest.where(conditions)) end @@ -37,18 +37,18 @@ get :show, params: { url_name: "tgq", view: 'successful' } conditions = { described_state: 'successful', public_body_id: public_bodies(:geraldine_public_body).id } - actual = assigns[:xapian_requests].results.map { - |x| x[:model].info_request - } + actual = assigns[:xapian_requests].results.map do |x| + x[:model].info_request + end expect(actual).to match_array(InfoRequest.where(conditions)) end it "should assign the requests (3)" do get :show, params: { url_name: "dfh", view: 'all' } conditions = { public_body_id: public_bodies(:humpadink_public_body).id } - actual = assigns[:xapian_requests].results.map { - |x| x[:model].info_request - } + actual = assigns[:xapian_requests].results.map do |x| + x[:model].info_request + end expect(actual).to match_array(InfoRequest.where(conditions)) end @@ -223,14 +223,16 @@ def make_single_language_example(locale) expect(response).to render_template('list') - expect(assigns[:public_bodies]).to eq([ - public_bodies(:other_public_body), - public_bodies(:humpadink_public_body), - public_bodies(:forlorn_public_body), - public_bodies(:geraldine_public_body), - public_bodies(:sensible_walks_public_body), - public_bodies(:silly_walks_public_body) - ]) + expect(assigns[:public_bodies]).to eq( + [ + public_bodies(:other_public_body), + public_bodies(:humpadink_public_body), + public_bodies(:forlorn_public_body), + public_bodies(:geraldine_public_body), + public_bodies(:sensible_walks_public_body), + public_bodies(:silly_walks_public_body) + ] + ) expect(assigns[:tag]).to eq("all") expect(assigns[:description]).to eq("Found 6 public authorities") end @@ -312,10 +314,12 @@ def make_single_language_example(locale) with_default_locale(:es) do get :list expect(response).to render_template('list') - expect(assigns[:public_bodies]).to eq([ - public_bodies(:geraldine_public_body), - public_bodies(:humpadink_public_body) - ]) + expect(assigns[:public_bodies]).to eq( + [ + public_bodies(:geraldine_public_body), + public_bodies(:humpadink_public_body) + ] + ) expect(assigns[:tag]).to eq("all") expect(assigns[:description]).to eq("Found 2 public authorities") end @@ -342,24 +346,28 @@ def make_single_language_example(locale) get :list, params: { tag: "other" } expect(response).to render_template('list') - expect(assigns[:public_bodies]).to eq([ - public_bodies(:other_public_body), - public_bodies(:forlorn_public_body), - public_bodies(:geraldine_public_body), - public_bodies(:sensible_walks_public_body), - public_bodies(:silly_walks_public_body) - ]) + expect(assigns[:public_bodies]).to eq( + [ + public_bodies(:other_public_body), + public_bodies(:forlorn_public_body), + public_bodies(:geraldine_public_body), + public_bodies(:sensible_walks_public_body), + public_bodies(:silly_walks_public_body) + ] + ) get :list expect(response).to render_template('list') - expect(assigns[:public_bodies]).to eq([ - public_bodies(:other_public_body), - public_bodies(:humpadink_public_body), - public_bodies(:forlorn_public_body), - public_bodies(:geraldine_public_body), - public_bodies(:sensible_walks_public_body), - public_bodies(:silly_walks_public_body) - ]) + expect(assigns[:public_bodies]).to eq( + [ + public_bodies(:other_public_body), + public_bodies(:humpadink_public_body), + public_bodies(:forlorn_public_body), + public_bodies(:geraldine_public_body), + public_bodies(:sensible_walks_public_body), + public_bodies(:silly_walks_public_body) + ] + ) end it "should list a machine tagged thing, should get it in both ways" do diff --git a/spec/controllers/reports_controller_spec.rb b/spec/controllers/reports_controller_spec.rb index 31059033762..ace688eaf2d 100644 --- a/spec/controllers/reports_controller_spec.rb +++ b/spec/controllers/reports_controller_spec.rb @@ -13,8 +13,8 @@ reason: "my reason" } expect(flash[:notice]).to match(/You need to be logged in/) - expect(response) - .to redirect_to show_request_path(url_title: info_request.url_title) + expect(response). + to redirect_to show_request_path(url_title: info_request.url_title) end end @@ -96,8 +96,8 @@ request_id: info_request.url_title, reason: "my reason" } - expect(response) - .to redirect_to show_request_path(url_title: info_request.url_title) + expect(response). + to redirect_to show_request_path(url_title: info_request.url_title) info_request.reload expect(info_request.attention_requested).to eq(true) @@ -121,15 +121,15 @@ request_id: info_request.url_title, reason: "my reason" } - expect(response) - .to redirect_to show_request_url(url_title: info_request.url_title) + expect(response). + to redirect_to show_request_url(url_title: info_request.url_title) post :create, params: { request_id: info_request.url_title, reason: "my reason" } - expect(response) - .to redirect_to show_request_url(url_title: info_request.url_title) + expect(response). + to redirect_to show_request_url(url_title: info_request.url_title) expect(flash[:notice]).to match(/has already been reported/) end @@ -291,8 +291,8 @@ message: "It's just not" } - expect(response) - .to redirect_to show_request_path(url_title: info_request.url_title) + expect(response). + to redirect_to show_request_path(url_title: info_request.url_title) end end diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index ad452380bf7..7b2c3ed9182 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -34,7 +34,7 @@ end it 'should not raise an error for a page param of less than zero, but should treat it as a param of 1' do - expect {get :list, params: { view: 'all', page: "-1" }}.not_to raise_error + expect { get :list, params: { view: 'all', page: "-1" } }.not_to raise_error expect(assigns[:page]).to eq(1) end @@ -955,7 +955,7 @@ def send_request tag_string: "" }, outgoing_message: { - body: "This is a silly letter. It is too short to be interesting." + body: "This is a silly letter. It is too short to be interesting." }, submitted_new_request: 1, preview: 1 @@ -1131,7 +1131,6 @@ def send_request url_title: 'what_is_the_answer_to_the_ultima' ) - post :new, params: { info_request: { public_body_id: @body.id, @@ -1187,7 +1186,6 @@ def send_request url_title: 'what_is_the_answer_to_the_ultima' ) - post :new, params: { info_request: { public_body_id: @body.id, @@ -1323,8 +1321,8 @@ def send_request submitted_new_request: 1, preview: 0 } - expect(flash[:error]) - .to eq('There was an error with the reCAPTCHA. Please try again.') + expect(flash[:error]). + to eq('There was an error with the reCAPTCHA. Please try again.') end it 'renders the compose interface' do diff --git a/spec/controllers/users/sessions_controller_spec.rb b/spec/controllers/users/sessions_controller_spec.rb index 949b4ee22e4..80e88c9c44d 100644 --- a/spec/controllers/users/sessions_controller_spec.rb +++ b/spec/controllers/users/sessions_controller_spec.rb @@ -367,12 +367,13 @@ def do_signin(email, password) # check is right confirmation URL expect(mail_token).to eq(post_redirect.email_token) - expect(Rails.application.routes.recognize_path(mail_path)). - to eq({ + expect(Rails.application.routes.recognize_path(mail_path)).to eq( + { controller: 'user', action: 'confirm', email_token: mail_token - }) + } + ) # check confirmation URL works expect(session[:user_id]).to be_nil @@ -410,12 +411,13 @@ def do_signin(email, password) # check is right confirmation URL expect(mail_token).to eq(post_redirect.email_token) - expect(Rails.application.routes.recognize_path(mail_path)). - to eq({ + expect(Rails.application.routes.recognize_path(mail_path)).to eq( + { controller: 'user', action: 'confirm', email_token: mail_token - }) + } + ) # Log in as an admin sign_in users(:admin_user)