diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index bbfeb6763b..fe59243ad7 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -6,16 +6,6 @@ # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 287 -# Cop supports --auto-correct. -# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle. -# SupportedHashRocketStyles: key, separator, table -# SupportedColonStyles: key, separator, table -# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit -Layout/HashAlignment: - Exclude: - - 'app/extensions/string_extensions.rb' - # Offense count: 1 # Cop supports --auto-correct. Layout/SpaceAroundMethodCallOperator: @@ -38,17 +28,6 @@ Layout/SpaceInsideArrayLiteralBrackets: Exclude: - 'app/classes/api/observation_api.rb' -# Offense count: 68 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: space, no_space -Layout/SpaceInsideStringInterpolation: - Exclude: - - 'test/controllers/location_controller_test.rb' - - 'test/controllers/observer_controller_test.rb' - - 'test/integration/capybara_lurker_test.rb' - - 'test/integration/filter_test.rb' - # Offense count: 1 Lint/AmbiguousRegexpLiteral: Exclude: diff --git a/test/controllers/location_controller_test.rb b/test/controllers/location_controller_test.rb index 502e01da11..bd1b08b11e 100644 --- a/test/controllers/location_controller_test.rb +++ b/test/controllers/location_controller_test.rb @@ -215,7 +215,7 @@ def test_location_descriptions_by_author desc = location_descriptions(:albion_desc) get_with_dump(:location_descriptions_by_author, id: rolf.id) assert_redirected_to( - %r{/location/show_location_description/#{ desc.id }} + %r{/location/show_location_description/#{desc.id}} ) end diff --git a/test/controllers/observer_controller_test.rb b/test/controllers/observer_controller_test.rb index a1ece57278..8d403139d2 100644 --- a/test/controllers/observer_controller_test.rb +++ b/test/controllers/observer_controller_test.rb @@ -411,7 +411,7 @@ def test_advanced_search_form } ) assert_response(:redirect) - assert_match(%r{#{ model.show_controller }/advanced_search}, + assert_match(%r{#{model.show_controller}/advanced_search}, redirect_to_url) end end @@ -2312,26 +2312,26 @@ def test_name_resolution params[:approved_name] = nil post(:create_observation, params: params) # assert_template(action: expected_page) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) params[:name][:name] = "Agaricus sp" params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) params[:name][:name] = "Agaricus sp." params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) # Can we create observation with genus and add author? params[:name][:name] = "Agaricus Author" params[:approved_name] = "Agaricus Author" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) assert_equal("Agaricus Author", agaricus.reload.search_name) agaricus.author = nil @@ -2341,7 +2341,7 @@ def test_name_resolution params[:name][:name] = "Agaricus sp Author" params[:approved_name] = "Agaricus sp Author" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) assert_equal("Agaricus Author", agaricus.reload.search_name) agaricus.author = nil @@ -2351,7 +2351,7 @@ def test_name_resolution params[:name][:name] = "Agaricus sp. Author" params[:approved_name] = "Agaricus sp. Author" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) assert_equal("Agaricus Author", agaricus.reload.search_name) @@ -2359,19 +2359,19 @@ def test_name_resolution params[:name][:name] = "Agaricus Author" params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) params[:name][:name] = "Agaricus sp Author" params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) params[:name][:name] = "Agaricus sp. Author" params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(agaricus.id, assigns(:observation).name_id) # Can we create observation with deprecated genus? @@ -2379,26 +2379,26 @@ def test_name_resolution params[:name][:name] = "Psalliota" params[:approved_name] = "Psalliota" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(psalliota.id, assigns(:observation).name_id) params[:name][:name] = "Psalliota sp" params[:approved_name] = "Psalliota sp" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(psalliota.id, assigns(:observation).name_id) params[:name][:name] = "Psalliota sp." params[:approved_name] = "Psalliota sp." post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(psalliota.id, assigns(:observation).name_id) # Can we create observation with deprecated genus, adding author? params[:name][:name] = "Psalliota Author" params[:approved_name] = "Psalliota Author" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(psalliota.id, assigns(:observation).name_id) assert_equal("Psalliota Author", psalliota.reload.search_name) psalliota.author = nil @@ -2408,7 +2408,7 @@ def test_name_resolution params[:name][:name] = "Psalliota sp Author" params[:approved_name] = "Psalliota sp Author" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(psalliota.id, assigns(:observation).name_id) assert_equal("Psalliota Author", psalliota.reload.search_name) psalliota.author = nil @@ -2418,7 +2418,7 @@ def test_name_resolution params[:name][:name] = "Psalliota sp. Author" params[:approved_name] = "Psalliota sp. Author" post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal(psalliota.id, assigns(:observation).name_id) assert_equal("Psalliota Author", psalliota.reload.search_name) @@ -2427,73 +2427,73 @@ def test_name_resolution params[:approved_name] = '"One"' post(:create_observation, params: params) # assert_template(controller: :observer, action: expected_page) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One"', assigns(:observation).name.text_name) assert_equal('"One"', assigns(:observation).name.search_name) params[:name][:name] = '"Two" sp' params[:approved_name] = '"Two" sp' post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"Two"', assigns(:observation).name.text_name) assert_equal('"Two"', assigns(:observation).name.search_name) params[:name][:name] = '"Three" sp.' params[:approved_name] = '"Three" sp.' post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"Three"', assigns(:observation).name.text_name) assert_equal('"Three"', assigns(:observation).name.search_name) params[:name][:name] = '"One"' params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One"', assigns(:observation).name.text_name) params[:name][:name] = '"One" sp' params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One"', assigns(:observation).name.text_name) params[:name][:name] = '"One" sp.' params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One"', assigns(:observation).name.text_name) # Can we create species under the quoted genus? params[:name][:name] = '"One" foo' params[:approved_name] = '"One" foo' post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One" foo', assigns(:observation).name.text_name) params[:name][:name] = '"One" "bar"' params[:approved_name] = '"One" "bar"' post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One" "bar"', assigns(:observation).name.text_name) params[:name][:name] = '"One" Author' params[:approved_name] = '"One" Author' post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One"', assigns(:observation).name.text_name) assert_equal('"One" Author', assigns(:observation).name.search_name) params[:name][:name] = '"One" sp Author' params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One"', assigns(:observation).name.text_name) assert_equal('"One" Author', assigns(:observation).name.search_name) params[:name][:name] = '"One" sp. Author' params[:approved_name] = nil post(:create_observation, params: params) - assert_redirected_to(/#{ expected_page }/) + assert_redirected_to(/#{expected_page}/) assert_equal('"One"', assigns(:observation).name.text_name) assert_equal('"One" Author', assigns(:observation).name.search_name) end diff --git a/test/integration/capybara_lurker_test.rb b/test/integration/capybara_lurker_test.rb index 242deecd22..0f27d1d068 100644 --- a/test/integration/capybara_lurker_test.rb +++ b/test/integration/capybara_lurker_test.rb @@ -21,7 +21,7 @@ def test_poke_around # Click on first observation in feed results first(:xpath, rss_observation_created_xpath).click - assert_match(/#{:app_title.l }: Observation/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: Observation/, page.title, "Wrong page") # Click on next (catches a bug seen in the wild). # Above comment about "next" does not match "Prev" in code @@ -29,26 +29,26 @@ def test_poke_around go_back_after do click_link("« Prev") end # back at Observation - assert_match(/#{:app_title.l }: Observation/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: Observation/, page.title, "Wrong page") # Click on the first image. go_back_after do first(:xpath, observation_image_xpath).click - assert_match(/#{:app_title.l }: Image/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: Image/, page.title, "Wrong page") end # back at Observation - assert_match(/#{:app_title.l }: Observation/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: Observation/, page.title, "Wrong page") # Go back to observation and click on "About...". click_link("About ") - assert_match(/#{:app_title.l }: Name/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: Name/, page.title, "Wrong page") # Take a look at the occurrence map. click_link("Occurrence Map") - assert_match(/#{:app_title.l }: Occurrence Map/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: Occurrence Map/, page.title, "Wrong page") # Check out a few links from left-hand panel. click_on("How To Use") - assert_match(/#{:app_title.l }: How to Use/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: How to Use/, page.title, "Wrong page") click_on("Français") subtitle = if :how_title.has_translation? @@ -56,7 +56,7 @@ def test_poke_around else "How to Use" end - assert_match(/#{:app_title.l }: #{subtitle}/, page.title, "Wrong page") + assert_match(/#{:app_title.l}: #{subtitle}/, page.title, "Wrong page") click_on("Contributeurs") subtitle = if :users_by_contribution_title.has_translation? @@ -100,7 +100,7 @@ def test_show_observation assert_equal("#{:app_title.l}: Activity Log", page.title, "Login failed") visit("/#{obs.id}") - assert_match(/#{:app_title.l }: Observation #{obs.id}/, page.title, + assert_match(/#{:app_title.l}: Observation #{obs.id}/, page.title, "Wrong page") # Make sure we're displaying original names of images @@ -130,7 +130,7 @@ def test_show_observation # Check out location. go_back_after do click_link(obs.location.name) - assert_match(/^#{:app_title.l }: Location/, page.title, "Login failed") + assert_match(/^#{:app_title.l}: Location/, page.title, "Login failed") end # back at Observation # Check out species list. @@ -138,7 +138,7 @@ def test_show_observation list = SpeciesList.joins(:observations). where("observation_id = ?", obs.id).first click_link(list.title) - assert_match(/^#{:app_title.l }: Species List: #{list.title}/, + assert_match(/^#{:app_title.l}: Species List: #{list.title}/, page.title, "Wrong page") # (Make sure observation is shown somewhere.) diff --git a/test/integration/filter_test.rb b/test/integration/filter_test.rb index 785c1cb20b..c9b42449e3 100644 --- a/test/integration/filter_test.rb +++ b/test/integration/filter_test.rb @@ -24,7 +24,7 @@ def test_user_content_filter click_button("Search") assert_match( - /#{:app_title.l }: Observations Matching ‘#{obs.name.text_name}/, + /#{:app_title.l}: Observations Matching ‘#{obs.name.text_name}/, page.title, "Wrong page" ) page.find_by_id("title"). # rubocop:disable Rails/DynamicFindBy