diff --git a/.github/workflows/ci_rails.yml b/.github/workflows/ci_rails.yml
index e87a44b2e6..d4d6eec05c 100644
--- a/.github/workflows/ci_rails.yml
+++ b/.github/workflows/ci_rails.yml
@@ -76,8 +76,8 @@ jobs:
         run: bundle exec rails test:all
 
       # https://github.com/marketplace/actions/coveralls-github-action
-      - name: Coveralls
-        uses: coverallsapp/github-action@master
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/github-action@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ./coverage/lcov/lcov.info
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a87c635e6b..8c707ea4fc 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,17 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit`
-# on 2024-02-21 17:54:32 UTC using RuboCop version 1.60.2.
+# `rubocop --auto-gen-config`
+# on 2024-07-18 12:46:04 UTC using RuboCop version 1.65.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'config/initializers/permissions_policy.rb'
+
 # Offense count: 10
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
@@ -14,7 +20,13 @@ Layout/LineLength:
   Exclude:
     - 'lib/core_extensions/action_view/log_subscriber.rb'
 
-## Offense count: 3
+# Offense count: 2
+# Configuration parameters: DebuggerMethods, DebuggerRequires.
+Lint/Debugger:
+  Exclude:
+    - 'test/session_extensions.rb'
+
+# Offense count: 3
 Lint/DuplicateMethods:
   Exclude:
     - 'app/classes/query/modules/active_record.rb'
@@ -44,6 +56,12 @@ Lint/NonLocalExitFromIterator:
   Exclude:
     - 'test/general_extensions.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'app/helpers/matrix_box_helper.rb'
+
 # Offense count: 1
 Lint/RescueException:
   Exclude:
@@ -64,6 +82,7 @@ Lint/SuppressedException:
 
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 Lint/UselessMethodDefinition:
   Exclude:
     - 'app/classes/query/location_by_editor.rb'
@@ -71,7 +90,7 @@ Lint/UselessMethodDefinition:
 
 # Offense count: 8
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: CheckForMethodsWithNoSideEffects.
+# Configuration parameters: AutoCorrect, CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
     - 'app/classes/mo_paginator.rb'
@@ -80,63 +99,40 @@ Lint/Void:
     - 'app/classes/query/modules/sequence_operators.rb'
     - 'app/models/observation.rb'
 
-# Offense count: 311
+# Offense count: 343
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 78
 
-# Offense count: 29
+# Offense count: 31
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 248
 
-# Offense count: 7
-# Configuration parameters: CountBlocks, Max.
+# Offense count: 1
+# Configuration parameters: CountBlocks, CountModifierForms.
 Metrics/BlockNesting:
-  Exclude:
-    - 'app/classes/tree.rb'
-    - 'app/controllers/observations_controller/form_helpers.rb'
-    - 'test/controller_extensions.rb'
+  Max: 4
 
-# Offense count: 7
+# Offense count: 4
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
-    - 'app/classes/site_data.rb'
     - 'app/classes/textile.rb'
     - 'app/extensions/string_extensions.rb'
     - 'app/models/abstract_model.rb'
     - 'app/models/description.rb'
-    - 'app/models/location.rb'
-    - 'app/models/user.rb'
 
-# Offense count: 113
+# Offense count: 118
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 28
 
-# Offense count: 21
+# Offense count: 19
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Exclude:
-    - 'app/classes/query/modules/joining.rb'
-    - 'app/classes/query/modules/sql.rb'
-    - 'app/classes/site_data.rb'
-    - 'app/classes/tree.rb'
-    - 'app/controllers/concerns/descriptions.rb'
-    - 'app/controllers/concerns/descriptions/permissions.rb'
-    - 'app/controllers/concerns/descriptions/publish.rb'
-    - 'app/controllers/locations_controller.rb'
-    - 'app/controllers/names/eol_data/preview_controller.rb'
-    - 'app/extensions/symbol_extensions.rb'
-    - 'app/helpers/pagination_helper.rb'
-    - 'app/models/language_exporter.rb'
-    - 'app/models/location.rb'
-    - 'app/models/name/notify.rb'
-    - 'app/models/name/parse.rb'
-    - 'app/models/name_sorter.rb'
-    - 'script/bulk_name_change'
+  Enabled: false
 
 # Offense count: 4
 # Configuration parameters: CountComments, Max, CountAsOne.
@@ -148,22 +144,16 @@ Metrics/ModuleLength:
     - 'app/models/name/parse.rb'
 
 # Offense count: 8
-# Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
-  Exclude:
-    - 'app/classes/mappable/minimal_location.rb'
-    - 'app/models/queued_email/name_change.rb'
-    - 'script/mushroom_mapper.rb'
-    - 'test/controller_extensions.rb'
-    - 'test/controllers/projects/members_controller_test.rb'
-    - 'test/models/collapsible_map_test.rb'
+  Max: 9
 
-# Offense count: 90
+# Offense count: 91
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 29
 
-# Offense count: 11
+# Offense count: 10
 Naming/AccessorMethodName:
   Exclude:
     - 'app/classes/eol_data.rb'
@@ -188,57 +178,22 @@ Naming/HeredocDelimiterNaming:
 # AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
-  Exclude:
-    - 'app/classes/eol_data.rb'
-    - 'app/classes/pattern_search/observation.rb'
-    - 'app/classes/run_level.rb'
-    - 'app/classes/tree.rb'
-    - 'app/controllers/api2_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/extensions/array_extensions.rb'
-    - 'app/extensions/hash_extensions.rb'
-    - 'app/extensions/string_extensions.rb'
-    - 'app/extensions/symbol_extensions.rb'
-    - 'app/helpers/descriptions_helper.rb'
-    - 'app/models/abstract_model.rb'
-    - 'app/models/description.rb'
-    - 'app/models/location.rb'
-    - 'app/models/name/lifeform.rb'
-    - 'app/models/name/spelling.rb'
-    - 'app/models/name/taxonomy.rb'
-    - 'app/models/name_parse.rb'
-    - 'app/models/observation.rb'
-    - 'app/models/project.rb'
+  Enabled: false
 
 # Offense count: 125
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
 # AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
-  Exclude:
-    - 'app/controllers/info_controller.rb'
-    - 'app/controllers/support_controller.rb'
-    - 'app/models/naming.rb'
-    - 'app/models/vote.rb'
-    - 'test/controllers/comments_controller_test.rb'
-    - 'test/controllers/lookups_controller_test.rb'
-    - 'test/controllers/names/synonyms_controller_test.rb'
-    - 'test/controllers/support_controller_test.rb'
-    - 'test/mailers/application_mailer_test.rb'
-    - 'test/mailers/queued_email_test.rb'
-    - 'test/models/api2_test.rb'
-    - 'test/models/name_sorter_test.rb'
-    - 'test/models/name_test.rb'
-    - 'test/models/observation_test.rb'
-    - 'test/models/query_test.rb'
-    - 'test/system/observation_show_system_test.rb'
+  Enabled: false
 
-# Offense count: 1
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
 Rails/Blank:
   Exclude:
     - 'app/controllers/application_controller.rb'
+    - 'app/models/image.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -268,7 +223,7 @@ Rails/FindEach:
     - 'test/controllers/herbaria_controller_test.rb'
     - 'test/models/localization_files_test.rb'
 
-# Offense count: 46
+# Offense count: 45
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -288,6 +243,14 @@ Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/application_helper.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: numeric, symbolic
+Rails/HttpStatus:
+  Exclude:
+    - 'test/controllers/images_controller_test.rb'
+
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Include.
@@ -350,6 +313,20 @@ Security/Eval:
   Exclude:
     - 'script/config.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
+# RedundantRestArgumentNames: args, arguments
+# RedundantKeywordRestArgumentNames: kwargs, options, opts
+# RedundantBlockArgumentNames: blk, block, proc
+Style/ArgumentsForwarding:
+  Exclude:
+    - 'app/models/image.rb'
+
+# Offense count: 70
+Style/ClassVars:
+  Enabled: false
+
 # Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CombinableLoops:
@@ -372,6 +349,20 @@ Style/IfUnlessModifier:
   Exclude:
     - 'lib/core_extensions/action_view/log_subscriber.rb'
 
+# Offense count: 11
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapIntoArray:
+  Exclude:
+    - 'app/extensions/symbol_extensions.rb'
+    - 'app/helpers/descriptions_helper.rb'
+    - 'app/helpers/tabs/locations_helper.rb'
+    - 'app/helpers/title_and_tabset_helper.rb'
+    - 'app/helpers/user_stats_helper.rb'
+    - 'app/models/name/spelling.rb'
+    - 'app/models/queued_email.rb'
+    - 'app/models/vote.rb'
+    - 'test/general_extensions.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -395,39 +386,17 @@ Style/Next:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MinDigits, Strict, AllowedNumbers, AllowedPatterns.
+# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
 Style/NumericLiterals:
-  Exclude:
-    - 'app/controllers/application_controller.rb'
+  MinDigits: 7
 
 # Offense count: 49
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
-  Exclude:
-    - 'app/classes/pattern_search/term.rb'
-    - 'app/classes/query/modules/sequence_operators.rb'
-    - 'app/classes/query/modules/sql.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/extensions/string_extensions.rb'
-    - 'app/extensions/symbol_extensions.rb'
-    - 'app/helpers/content_helper.rb'
-    - 'app/helpers/object_link_helper.rb'
-    - 'app/models/location.rb'
-    - 'app/models/name/change.rb'
-    - 'app/models/name/parse.rb'
-    - 'app/models/queued_email.rb'
-    - 'app/models/queued_email/name_change.rb'
-    - 'app/models/visual_group.rb'
-    - 'app/models/visual_model.rb'
-    - 'script/download_symbiota.rb'
-    - 'test/capybara_session_extensions.rb'
-    - 'test/check_for_unsafe_html.rb'
-    - 'test/controllers/donations_controller_test_helpers.rb'
-    - 'test/session_extensions.rb'
-    - 'test/session_form_extensions.rb'
+  Enabled: false
 
-# Offense count: 10
+# Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantParentheses:
   Exclude:
@@ -438,7 +407,6 @@ Style/RedundantParentheses:
     - 'app/helpers/title_and_tabset_helper.rb'
     - 'app/models/name.rb'
     - 'test/controller_extensions.rb'
-    - 'test/controllers/emails_controller_test.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -472,19 +440,27 @@ Style/SlicingWithRange:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
+  Enabled: false
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
   Exclude:
-    - 'app/classes/labels.rb'
-    - 'app/extensions/string_extensions.rb'
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/descriptions_helper.rb'
-    - 'app/helpers/suggestions_helper.rb'
-    - 'app/helpers/versions_helper.rb'
-    - 'app/models/comment/callbacks.rb'
-    - 'app/models/interest.rb'
-    - 'app/models/language_exporter.rb'
-    - 'app/models/name/parse.rb'
-    - 'app/models/rss_log.rb'
-    - 'config/unicorn.rb'
-    - 'config/unicorn_dev.rb'
-    - 'lib/tasks/lang.rake'
-    - 'script/refresh_name_lister_cache'
+    - 'app/classes/checklist.rb'
+
+# Offense count: 14
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperArguments:
+  Exclude:
+    - 'app/classes/api2/error/create_failed.rb'
+    - 'app/classes/report/base_table.rb'
+    - 'app/classes/report/darwin/images.rb'
+    - 'app/classes/report/darwin/observations.rb'
+    - 'app/classes/report/darwin/taxa.rb'
+    - 'app/classes/report/dwca.rb'
+    - 'app/classes/report/zip_report.rb'
+    - 'app/models/field_slip_job_tracker.rb'
+    - 'app/models/image.rb'
+    - 'test/functional_test_case.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5aaaa7154b..fbfd3ce79c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,8 +60,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     arel-helpers (2.14.0)
       activerecord (>= 3.1.0, < 8)
@@ -82,7 +82,7 @@ GEM
       racc
     browser (6.0.0)
     builder (3.3.0)
-    bullet (7.1.6)
+    bullet (7.2.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     cache_with_locale (0.0.3)
@@ -99,7 +99,7 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     chunky_png (1.4.0)
-    concurrent-ruby (1.3.2)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -107,16 +107,16 @@ GEM
     crass (1.0.6)
     css_parser (1.17.1)
       addressable
-    cuprite (0.15)
+    cuprite (0.15.1)
       capybara (~> 3.0)
-      ferrum (~> 0.14.0)
+      ferrum (~> 0.15.0)
     dartsass-sprockets (3.1.0)
       railties (>= 4.0.0)
       sassc-embedded (~> 1.69)
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
@@ -127,7 +127,7 @@ GEM
     docile (1.4.0)
     domain_name (0.6.20240107)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
     execjs (2.9.1)
@@ -137,11 +137,11 @@ GEM
     faraday-net_http (3.1.0)
       net-http
     fastimage (2.3.1)
-    ferrum (0.14)
+    ferrum (0.15)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
-      websocket-driver (>= 0.6, < 0.8)
+      websocket-driver (~> 0.7)
     ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
@@ -150,13 +150,13 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (4.27.1-arm64-darwin)
+    google-protobuf (4.27.2-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.1-x86_64-darwin)
+    google-protobuf (4.27.2-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.1-x86_64-linux)
+    google-protobuf (4.27.2-x86_64-linux)
       bigdecimal
       rake (>= 13)
     hashdiff (1.1.0)
@@ -174,7 +174,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.12.0)
@@ -206,8 +206,8 @@ GEM
     mini_mime (1.1.5)
     mini_racer (0.12.0)
       libv8-node (~> 21.7.2.0)
-    minitest (5.23.1)
-    minitest-reporters (1.6.1)
+    minitest (5.24.1)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
@@ -216,7 +216,7 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.12)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -226,13 +226,13 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     netrc (0.11.0)
-    newrelic_rpm (9.10.2)
+    newrelic_rpm (9.11.0)
     nio4r (2.7.3)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -242,7 +242,7 @@ GEM
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -252,20 +252,20 @@ GEM
     prawn-manual_builder (0.4.0)
       prawn (~> 2.4.0)
       prism (~> 0.22.0)
-    prawn-svg (0.34.2)
+    prawn-svg (0.35.1)
       css_parser (~> 1.6)
       matrix (~> 0.4.2)
       prawn (>= 0.11.1, < 3)
-      rexml (~> 3.2)
+      rexml (>= 3.2.0, < 4)
     prism (0.22.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -299,7 +299,7 @@ GEM
       psych (>= 4.0.0)
     redis (4.8.1)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     requestjs-rails (0.0.11)
       railties (>= 6.1.0)
@@ -308,30 +308,30 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.2)
+      strscan
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
     rtf (0.3.3)
-    rubocop (1.64.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -340,16 +340,16 @@ GEM
       rubocop (>= 0.90.0)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    sass-embedded (1.77.4-arm64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.4-x86_64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.4-x86_64-linux-gnu)
-      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.8-arm64-darwin)
+      google-protobuf (~> 4.26)
+    sass-embedded (1.77.8-x86_64-darwin)
+      google-protobuf (~> 4.26)
+    sass-embedded (1.77.8-x86_64-linux-gnu)
+      google-protobuf (~> 4.26)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sassc-embedded (1.76.0)
-      sass-embedded (~> 1.76)
+    sassc-embedded (1.77.7)
+      sass-embedded (~> 1.77)
     set (1.1.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -365,7 +365,7 @@ GEM
       activejob (>= 7)
       activerecord (>= 7)
       railties (>= 7)
-    solid_queue (0.3.2)
+    solid_queue (0.3.3)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
@@ -383,12 +383,12 @@ GEM
       sprockets (>= 3.0.0)
     stimulus-rails (1.3.3)
       railties (>= 6.0.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
-    terser (1.2.2)
+    terser (1.2.3)
       execjs (>= 0.3.0, < 3)
     thor (1.3.1)
-    tilt (2.3.0)
+    tilt (2.4.0)
     timeout (0.4.1)
     trilogy (2.8.1)
     ttfunk (1.8.0)
@@ -420,7 +420,7 @@ GEM
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   arm64-darwin-21
diff --git a/README_API.md b/README_API.md
index ef9ac1f27a..06d4147d1a 100644
--- a/README_API.md
+++ b/README_API.md
@@ -1,62 +1,46 @@
 Mushroom Observer API
 =====================
 
-Change Log
-----------
-
-v1 -- First version 2016.
-v2 -- Latest version 2020.
-
-The endpoint is now "api2" instead of "api".  The old endpoint will be phased
-out some time in 2021.  The default format is now JSON not XML, since JSON is
-significantly faster.  And a few result structures have been tweaked slightly:
-
-api_keys -- field names were wrong (created_at, last_used, num_uses)
-
-herbarium_records -- field names were wrong (initial_determination,
-accession_number)
-
-images -- moved observation_ids to high-detail response
-
-observations -- full consensus, location and owner details moved to high detail
-response, now only consensus_id, consensus_name, location_id, location_name and
-owner_id are found in low detail response; votes moved up to top level of the
-structure for high detail response (used to be buried within namings)
-
-projects -- removed admin and member ids
+Intended Use
+------------
 
-species_lists -- removed project_ids, full location details only available in
-high detail response now
+Our API is intended for individual MO users to create and modify their and other users' MO Observations (and other objects)
+and for developing applications to support them.
+It is not intended for data scraping or for generalized experimentation with AI, image recognition or large data sets.
+For those purposes you should use the CSV files described below.
 
-collection_numbers, comments, external_links, herbarium_records -- only
-includes observation ids now not full details
+We're an all-volunteer organization with a tiny budget and scarce resources.
+Using the API to obtain large amounts of data puts an unnecessary strain on those resources and adversely impacts other users.
+If we notice improper usage of the API or usage that seriously impacts our performance we may institute blocks without notification.
 
 CSV files
 ---------
 
-Note that we update a set of CSV files nightly which are straight dumps of the
-database.  If you are looking for large quantities of data, e.g. for data
-anaylsis or image recognition, plase look at these files first to see if they
+We update a set of CSV files nightly which are straight dumps of the MO
+database. If you are looking for large quantities of data, e.g. for data
+anaylsis or image recognition, look at these files first to see if they
 have the information you need.  That will save our server a considerable amount
 of unnecessary traffic, and probably save you a lot of work!
 
-* https://mushroomobserver.org/observations.csv
-* https://mushroomobserver.org/images_observations.csv
-* https://mushroomobserver.org/images.csv
-* https://mushroomobserver.org/names.csv
-* https://mushroomobserver.org/name_classifications.csv
-* https://mushroomobserver.org/name_descriptions.csv
-* https://mushroomobserver.org/locations.csv
-* https://mushroomobserver.org/location_descriptions.csv
+* <https://mushroomobserver.org/observations.csv>
+* <https://mushroomobserver.org/images_observations.csv>
+* <https://mushroomobserver.org/images.csv>
+* <https://mushroomobserver.org/names.csv>
+* <https://mushroomobserver.org/name_classifications.csv>
+* <https://mushroomobserver.org/name_descriptions.csv>
+* <https://mushroomobserver.org/locations.csv>
+* <https://mushroomobserver.org/location_descriptions.csv>
 
 Overview
 --------
 
 Mushroom Observer supports a simple API based on sending GET, POST, PATCH and
 DELETE requests to URLs of the form:
-```
+
+```ruby
 https://mushroomobserver.org/api2/<database_table>
 ```
+
 GET requests are read-only and do not require authentication.  POST (create),
 PATCH (update) and DELETE (destroy) requests require authentication via an API
 key (see below).
@@ -203,6 +187,7 @@ safe to mess around with strange parameters and see what they do.  Note that
 XML responses include a copy of the SQL query used.  This can be a very
 effective way of discovering exactly how unfamiliar parameters work.  Here's
 the SQL query from one of the examples above:
+
 ```sql
 SELECT DISTINCT observations.id
 FROM `observations`
@@ -210,6 +195,7 @@ WHERE MONTH(observations.when) >= 6 AND MONTH(observations.when) <= 6
 AND (observations.location_id IN (694,...,14040) OR observations.where LIKE '%Delaware%')
 ORDER BY observations.id ASC
 ```
+
 See also the database diagram here:
 
 * [DATA_STRUCTURE.gif](DATA_STRUCTURE.gif)
@@ -217,3 +203,33 @@ See also the database diagram here:
 and the database schema here:
 
 * [db/schema.rb](db/schema.rb)
+
+Change Log
+----------
+
+v1 -- First version 2016.
+v2 -- Latest version 2020.
+
+The endpoint is now "api2" instead of "api".  The old endpoint will be phased
+out some time in 2021.  The default format is now JSON not XML, since JSON is
+significantly faster.  And a few result structures have been tweaked slightly:
+
+api_keys -- field names were wrong (created_at, last_used, num_uses)
+
+herbarium_records -- field names were wrong (initial_determination,
+accession_number)
+
+images -- moved observation_ids to high-detail response
+
+observations -- full consensus, location and owner details moved to high detail
+response, now only consensus_id, consensus_name, location_id, location_name and
+owner_id are found in low detail response; votes moved up to top level of the
+structure for high detail response (used to be buried within namings)
+
+projects -- removed admin and member ids
+
+species_lists -- removed project_ids, full location details only available in
+high detail response now
+
+collection_numbers, comments, external_links, herbarium_records -- only
+includes observation ids now not full details
diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
index d87c128a24..6e1c43c907 100644
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -313,7 +313,7 @@ def date_select_with_label(**args)
     opts = separate_field_options_from_args(args, [:object, :data])
     opts[:class] = "form-control"
     opts[:data] = { controller: "year-input" }.merge(args[:data] || {})
-    date_select_opts = date_select_opts(args)
+    date_opts = date_select_opts(args)
     wrap_class = form_group_wrap_class(args)
     selects_class = "form-inline date-selects"
     selects_class += " d-inline-block" if args[:inline] == true
@@ -325,7 +325,7 @@ def date_select_with_label(**args)
       concat(args[:form].label(args[:field], args[:label], label_opts))
       concat(args[:between]) if args[:between].present?
       concat(tag.div(class: selects_class, id: identifier) do
-        concat(args[:form].date_select(args[:field], date_select_opts, opts))
+        concat(args[:form].date_select(args[:field], date_opts, opts))
       end)
       concat(args[:append]) if args[:append].present?
     end
@@ -333,15 +333,16 @@ def date_select_with_label(**args)
 
   # The index arg is for multiple date_selects in a form
   def date_select_opts(args = {})
-    obj = args[:object]
+    field = args[:field] || :when
+    obj = args[:object] || args[:form]&.object
     start_year = args[:start_year] || 20.years.ago.year
     end_year = args[:end_year] || Time.zone.now.year
-    init_value = obj.try(&:when).try(&:year)
+    init_value = obj.try(&field).try(&:year)
     if init_value && init_value < start_year && init_value > 1900
       start_year = init_value
     end
     opts = { start_year: start_year, end_year: end_year,
-             selected: obj.try(&:when) || Time.zone.today,
+             selected: obj.try(&field) || Time.zone.today,
              order: args[:order] || [:day, :month, :year] }
     opts[:index] = args[:index] if args[:index].present?
     opts
diff --git a/app/views/controllers/observations/form/_details.html.erb b/app/views/controllers/observations/form/_details.html.erb
index 7bd0c3a9ac..0909fff37a 100644
--- a/app/views/controllers/observations/form/_details.html.erb
+++ b/app/views/controllers/observations/form/_details.html.erb
@@ -8,7 +8,7 @@
     <div class="col-xs-12 col-md-6">
       <!-- WHEN -->
       <%= date_select_with_label(
-        form: f, field: :when, object: @observation, label: :WHEN.t + ":",
+        form: f, field: :when, label: :WHEN.t + ":",
       ) %>
       <!-- /WHEN -->
 
diff --git a/app/views/controllers/species_lists/_form.html.erb b/app/views/controllers/species_lists/_form.html.erb
index 663584192b..b86b03f4c8 100644
--- a/app/views/controllers/species_lists/_form.html.erb
+++ b/app/views/controllers/species_lists/_form.html.erb
@@ -38,7 +38,7 @@
                            label: "#{:form_species_lists_list_notes.l}:",
                            append: render(partial: "shared/textilize_help")) %>
 
-  <%= date_select_with_label(form: f, field: :when, object: @species_list,
+  <%= date_select_with_label(form: f, field: :when,
                              inline: true, label: "#{:WHEN.l}:") %>
 
   <%= render(partial: "shared/form_location_feedback",
diff --git a/test/controllers/observations_controller/observations_controller_create_test.rb b/test/controllers/observations_controller/observations_controller_create_test.rb
new file mode 100644
index 0000000000..58f24101d7
--- /dev/null
+++ b/test/controllers/observations_controller/observations_controller_create_test.rb
@@ -0,0 +1,1280 @@
+# frozen_string_literal: true
+
+require("test_helper")
+
+class ObservationsControllerCreateTest < FunctionalTestCase
+  tests ObservationsController
+
+  def modified_generic_params(params, user)
+    params[:observation] = sample_obs_fields.merge(params[:observation] || {})
+    params[:naming][:vote] = { value: "3" }.merge(params[:naming][:vote] || {})
+    params[:collection_number] =
+      default_collection_number_fields.merge(params[:collection_number] || {})
+    params[:herbarium_record] =
+      default_herbarium_record_fields.merge(params[:herbarium_record] || {})
+    params[:username] = user.login
+    params
+  end
+
+  def sample_obs_fields
+    { place_name: "Right Here, Massachusetts, USA",
+      lat: "",
+      lng: "",
+      alt: "",
+      "when(1i)" => "2007",
+      "when(2i)" => "10",
+      "when(3i)" => "31",
+      specimen: "0",
+      thumb_image_id: "0" }
+  end
+
+  def default_collection_number_fields
+    { name: "", number: "" }
+  end
+
+  def default_herbarium_record_fields
+    { herbarium_name: "", accession_number: "" }
+  end
+
+  def location_exists_or_place_name_blank(params)
+    Location.find_by(name: params[:observation][:place_name]) ||
+      Location.is_unknown?(params[:observation][:place_name]) ||
+      params[:observation][:place_name].blank?
+  end
+
+  # Test constructing observations in various ways (with minimal namings)
+  def generic_construct_observation(params, o_num, g_num, n_num, user = rolf)
+    o_count = Observation.count
+    g_count = Naming.count
+    n_count = Name.count
+    score   = user.reload.contribution
+    params  = modified_generic_params(params, user)
+
+    post_requires_login(:create, params)
+
+    begin
+      if o_num.zero?
+        assert_response(:success)
+      elsif location_exists_or_place_name_blank(params)
+        # assert_redirected_to(action: :show)
+        assert_response(:redirect)
+        assert_match(%r{/test.host/\d+\Z}, @response.redirect_url)
+      else
+        assert_response(:redirect)
+        # assert_redirected_to(/#{new_location_path}/)
+      end
+    rescue Minitest::Assertion => e
+      flash = get_last_flash.to_s.dup.sub!(/^(\d)/, "")
+      message = "#{e}\n" \
+                "Flash messages: (level #{Regexp.last_match(1)})\n" \
+                "< #{flash} >\n"
+      flunk(message)
+    end
+    assert_equal(o_count + o_num, Observation.count, "Wrong Observation count")
+    assert_equal(g_count + g_num, Naming.count, "Wrong Naming count")
+    assert_equal(n_count + n_num, Name.count, "Wrong Name count")
+    assert_equal(score + o_num + g_num * 2 + n_num * 10,
+                 user.reload.contribution,
+                 "Wrong User score")
+    return unless o_num == 1
+
+    assert_not_equal(
+      0,
+      @controller.instance_variable_get(:@observation).thumb_image_id,
+      "Wrong image id"
+    )
+  end
+
+  ##############################################################################
+
+  # ------------------------------
+  #  Test creating observations.
+  # ------------------------------
+
+  # Test "new" observation form.
+  def test_create_new_observation
+    requires_login(:new)
+    assert_form_action(action: :create, approved_name: "")
+    assert_input_value(:collection_number_name,
+                       users(:rolf).legal_name)
+    assert_input_value(:collection_number_number, "")
+    assert_input_value(:herbarium_record_herbarium_name,
+                       users(:rolf).preferred_herbarium_name)
+    assert_input_value(:herbarium_record_accession_number, "")
+    assert_true(@response.body.include?("Albion, Mendocino Co., California"))
+    users(:rolf).update(location_format: "scientific")
+    get(:new)
+    assert_true(@response.body.include?("California, Mendocino Co., Albion"))
+  end
+
+  def test_create_log_updated_at
+    params = {
+      naming: { name: "", vote: { value: "" } },
+      user: rolf,
+      where: locations.first.name
+    }
+
+    users(:rolf).login
+    post_requires_login(:create, params)
+
+    assert(Observation.last.log_updated_at.is_a?(Time),
+           "Observation should have log_updated_at time")
+  end
+
+  def test_create_observation_without_scientific_name
+    params = { user: rolf,
+               where: locations.first.name }
+    fungi = names(:fungi)
+
+    post_requires_login(:create, params)
+
+    assert_flash_success(
+      "Omitting Scientific Name should not cause flash error or warning."
+    )
+    assert_equal(
+      fungi, Observation.last.name,
+      "Observation should be id'd as `Fungi` if user omits Scientific Name."
+    )
+  end
+
+  def test_create_observation_with_unrecognized_name
+    text_name = "Elfin saddle"
+    params = { naming: { name: text_name },
+               user: rolf,
+               where: locations.first.name }
+    post_requires_login(:create, params)
+
+    assert_select("div[id='name_messages']",
+                  /MO does not recognize the name.*#{text_name}/)
+  end
+
+  def test_construct_observation_approved_place_name
+    where = "Albion, California, USA"
+    generic_construct_observation(
+      { observation: { place_name: where },
+        naming: { name: "Coprinus comatus" },
+        approved_place_name: "" },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert_equal(where, obs.place_name)
+    assert_equal("mo_website", obs.source)
+  end
+
+  def test_create_observation_with_field_slip
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        field_code: field_slips(:field_slip_no_obs).code,
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert(obs.field_slips.count == 1)
+  end
+
+  def test_create_observation_with_collection_number
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        collection_number: { name: "Billy Bob", number: "17-034" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert(obs.collection_numbers.count == 1)
+  end
+
+  def test_create_observation_with_used_collection_number
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        collection_number: { name: "Rolf Singer", number: "1" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert(obs.collection_numbers.count == 1)
+    assert_flash_warning
+  end
+
+  def test_create_observation_with_specimen_and_collector_but_no_number
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        collection_number: { name: "Rolf Singer", number: "" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert_empty(obs.collection_numbers)
+  end
+
+  def test_create_observation_with_collection_number_but_no_specimen
+    generic_construct_observation(
+      { collection_number: { name: "Rolf Singer", number: "3141" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert_not(obs.specimen)
+    assert_empty(obs.collection_numbers)
+  end
+
+  def test_create_observation_with_collection_number_but_no_collector
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        collection_number: { name: "", number: "27-18A.2" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert(obs.collection_numbers.count == 1)
+    col_num = obs.collection_numbers.first
+    assert_equal(rolf.legal_name, col_num.name)
+    assert_equal("27-18A.2", col_num.number)
+  end
+
+  def test_create_observation_with_herbarium_record
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        herbarium_record: {
+          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
+          accession_number: "1234"
+        },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert(obs.herbarium_records.count == 1)
+  end
+
+  def test_create_observation_with_herbarium_duplicate_label
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        herbarium_record: {
+          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
+          accession_number: "1234"
+        },
+        naming: { name: "Cortinarius sp." } },
+      0, 0, 0
+    )
+    assert_input_value(:herbarium_record_herbarium_name,
+                       "NY - The New York Botanical Garden")
+    assert_input_value(:herbarium_record_accession_number, "1234")
+  end
+
+  def test_create_observation_with_herbarium_no_id
+    name = "Coprinus comatus"
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        herbarium_record: {
+          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
+          accession_number: ""
+        },
+        naming: { name: name } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert_true(obs.specimen)
+    assert_equal(0, obs.herbarium_records.count)
+  end
+
+  def test_create_observation_with_herbarium_but_no_specimen
+    generic_construct_observation(
+      { herbarium_record: {
+          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
+          accession_number: "1234"
+        },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert_not(obs.specimen)
+    assert(obs.herbarium_records.count.zero?)
+  end
+
+  def test_create_observation_with_new_nonpersonal_herbarium
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        herbarium_record: { herbarium_name: "A Brand New Herbarium",
+                            accession_number: "" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert_empty(obs.herbarium_records)
+  end
+
+  def test_create_observation_with_new_personal_herbarium
+    generic_construct_observation(
+      { observation: { specimen: "1" },
+        herbarium_record: { herbarium_name: katrina.personal_herbarium_name,
+                            accession_number: "12345" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0, katrina
+    )
+    obs = assigns(:observation)
+    assert(obs.specimen)
+    assert_equal(1, obs.herbarium_records.count)
+    assert_not_empty(obs.herbarium_records)
+    herbarium_record = obs.herbarium_records.first
+    herbarium = herbarium_record.herbarium
+    assert(herbarium.curator?(katrina))
+    assert(herbarium.name.include?("Katrina"))
+  end
+
+  def test_create_simple_observation_with_approved_unique_name
+    where = "Simple, Massachusetts, USA"
+    generic_construct_observation(
+      { observation: { place_name: where, thumb_image_id: "0" },
+        naming: { name: "Coprinus comatus" } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    nam = assigns(:naming)
+    assert_equal(where, obs.where)
+    assert_equal(names(:coprinus_comatus).id, nam.name_id)
+    assert_equal("2.03659",
+                 format("%<vote_cache>.5f", vote_cache: obs.vote_cache))
+    assert_not_nil(obs.rss_log)
+    # This was getting set to zero instead of nil if no images were uploaded
+    # when obs was created.
+    assert_nil(obs.thumb_image_id)
+  end
+
+  def test_create_simple_observation_of_unknown_taxon
+    where = "Unknown, Massachusetts, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+    obs = assigns(:observation)
+    assert_equal(where, obs.where) # Make sure it's the right observation
+    assert_not_nil(obs.rss_log)
+  end
+
+  def test_create_observation_with_new_name
+    generic_construct_observation(
+      { naming: { name: "New name" } }, 0, 0, 0
+    )
+  end
+
+  def test_create_observation_with_approved_new_name
+    # Test an observation creation with an approved new name
+    generic_construct_observation(
+      { naming: { name: "Argus arg-arg" }, approved_name: "Argus arg-arg" },
+      1, 1, 2
+    )
+  end
+
+  def test_create_observation_with_approved_name_and_extra_space
+    generic_construct_observation(
+      { naming: { name: "Another new-name  " },
+        approved_name: "Another new-name  " },
+      1, 1, 2
+    )
+  end
+
+  def test_create_observation_with_approved_section
+    # (This is now supported nominally)
+    # (Use Macrocybe because it already exists and has an author.
+    # That way we know it is actually creating a name for this section.)
+    generic_construct_observation(
+      { naming: { name: "Macrocybe section Fakesection" },
+        approved_name: "Macrocybe section Fakesection" },
+      1, 1, 1
+    )
+  end
+
+  def test_create_observation_with_approved_junk_name
+    generic_construct_observation(
+      { naming: { name: "This is a bunch of junk" },
+        approved_name: "This is a bunch of junk" },
+      0, 0, 0
+    )
+  end
+
+  def test_create_observation_with_multiple_name_matches
+    generic_construct_observation(
+      { naming: { name: "Amanita baccata" } }, 0, 0, 0
+    )
+  end
+
+  def test_create_observation_choosing_one_of_multiple_name_matches
+    generic_construct_observation(
+      { naming: { name: "Amanita baccata" },
+        chosen_name: { name_id: names(:amanita_baccata_arora).id } },
+      1, 1, 0
+    )
+  end
+
+  def test_create_observation_choosing_deprecated_one_of_multiple_name_matches
+    generic_construct_observation(
+      { naming: { name: names(:pluteus_petasatus_deprecated).text_name } },
+      1, 1, 0
+    )
+    nam = assigns(:naming)
+    assert_equal(names(:pluteus_petasatus_approved).id, nam.name_id)
+  end
+
+  def test_create_observation_with_deprecated_name
+    generic_construct_observation(
+      { naming: { name: "Lactarius subalpinus" } }, 0, 0, 0
+    )
+  end
+
+  def test_create_observation_with_chosen_approved_synonym_of_deprecated_name
+    generic_construct_observation(
+      { naming: { name: "Lactarius subalpinus" },
+        approved_name: "Lactarius subalpinus",
+        chosen_name: { name_id: names(:lactarius_alpinus).id } },
+      1, 1, 0
+    )
+    nam = assigns(:naming)
+    assert_equal(nam.name, names(:lactarius_alpinus))
+  end
+
+  def test_create_observation_with_approved_deprecated_name
+    generic_construct_observation(
+      { naming: { name: "Lactarius subalpinus" },
+        approved_name: "Lactarius subalpinus",
+        chosen_name: {} },
+      1, 1, 0
+    )
+    nam = assigns(:naming)
+    assert_equal(nam.name, names(:lactarius_subalpinus))
+  end
+
+  def test_create_observation_with_approved_new_species
+    # Test an observation creation with an approved new name
+    Name.find_by(text_name: "Agaricus").destroy
+    generic_construct_observation(
+      { naming: { name: "Agaricus novus" },
+        approved_name: "Agaricus novus" },
+      1, 1, 2
+    )
+    name = Name.find_by(text_name: "Agaricus novus")
+    assert(name)
+    assert_equal("Agaricus novus", name.text_name)
+  end
+
+  def test_create_observation_that_generates_email
+    QueuedEmail.queue = true
+    count_before = QueuedEmail.count
+    name = names(:agaricus_campestris)
+    name_trackers = NameTracker.where(name: name)
+    assert_equal(2, name_trackers.length,
+                 "Should be 2 name name_trackers for name ##{name.id}")
+    assert(name_trackers.map(&:user).include?(mary))
+    mary.update(no_emails: true)
+
+    where = "Simple, Massachusetts, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: name.text_name } },
+      1, 1, 0
+    )
+    obs = assigns(:observation)
+    nam = assigns(:naming)
+
+    assert_equal(where, obs.where) # Make sure it's the right observation
+    assert_equal(name.id, nam.name_id) # Make sure it's the right name
+    assert_not_nil(obs.rss_log)
+    assert_equal(count_before + 1, QueuedEmail.count)
+    QueuedEmail.queue = false
+  end
+
+  def test_create_observation_with_decimal_geolocation_and_unknown_name
+    lat = 34.1622
+    lng = -118.3521
+    generic_construct_observation(
+      { observation: { place_name: "", lat: lat, lng: lng },
+        naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+    obs = assigns(:observation)
+
+    assert_equal(lat.to_s, obs.lat.to_s)
+    assert_equal(lng.to_s, obs.lng.to_s)
+    assert_objs_equal(Location.unknown, obs.location)
+    assert_not_nil(obs.rss_log)
+  end
+
+  def test_create_observation_with_dms_geolocation_and_unknown_name
+    lat2 = "34°9’43.92”N"
+    lng2 = "118°21′7.56″W"
+    generic_construct_observation(
+      { observation: { place_name: "", lat: lat2, lng: lng2 },
+        naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+    obs = assigns(:observation)
+
+    assert_equal("34.1622", obs.lat.to_s)
+    assert_equal("-118.3521", obs.lng.to_s)
+    assert_objs_equal(Location.unknown, obs.location)
+    assert_not_nil(obs.rss_log)
+  end
+
+  def test_create_observation_with_empty_geolocation_and_location
+    # Make sure it doesn't accept no location AND no lat/long.
+    generic_construct_observation(
+      { observation: { place_name: "", lat: "", lng: "" },
+        naming: { name: "Unknown" } },
+      0, 0, 0
+    )
+  end
+
+  def test_create_observations_with_unknown_location_and_empty_geolocation
+    # But create observation if explicitly tell it "unknown" location.
+    generic_construct_observation(
+      { observation: { place_name: "Earth", lat: "", lng: "" },
+        naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+  end
+
+  def test_create_observation_with_various_altitude_formats
+    [
+      ["500",     500],
+      ["500m",    500],
+      ["500 ft.", 152],
+      [" 500' ", 152]
+    ].each do |input, output|
+      where = "Unknown, Massachusetts, USA"
+
+      generic_construct_observation(
+        { observation: { place_name: where, alt: input },
+          naming: { name: "Unknown" } },
+        1, 0, 0
+      )
+      obs = assigns(:observation)
+
+      assert_equal(output, obs.alt)
+      assert_equal(where, obs.where) # Make sure it's the right observation
+      assert_not_nil(obs.rss_log)
+    end
+  end
+
+  def test_create_observation_creating_class
+    generic_construct_observation(
+      { observation: { place_name: "Earth", lat: "", lng: "" },
+        naming: { name: "Lecanoromycetes L." },
+        approved_name: "Lecanoromycetes L." },
+      1, 1, 1
+    )
+    name = Name.last
+    assert_equal("Lecanoromycetes", name.text_name)
+    assert_equal("L.", name.author)
+    assert_equal("Class", name.rank)
+  end
+
+  def test_create_observation_creating_family
+    params = {
+      observation: { place_name: "Earth", lat: "", lng: "" },
+      naming: { name: "Acarosporaceae" },
+      approved_name: "Acarosporaceae"
+    }
+    o_num = 1
+    g_num = 1
+    n_num = 1
+    user = rolf
+    o_count = Observation.count
+    g_count = Naming.count
+    n_count = Name.count
+    score   = user.reload.contribution
+    params  = modified_generic_params(params, user)
+
+    post_requires_login(:create, params)
+    name = Name.last
+
+    # assert_redirected_to(action: :show)
+    assert_response(:redirect)
+    assert_match(%r{/test.host/\d+\Z}, @response.redirect_url)
+    assert_equal(o_count + o_num, Observation.count, "Wrong Observation count")
+    assert_equal(g_count + g_num, Naming.count, "Wrong Naming count")
+    assert_equal(n_count + n_num, Name.count, "Wrong Name count")
+    assert_equal(score + o_num + g_num * 2 + n_num * 10,
+                 user.reload.contribution,
+                 "Wrong User score")
+    assert_not_equal(
+      0,
+      @controller.instance_variable_get(:@observation).thumb_image_id,
+      "Wrong image id"
+    )
+    assert_equal("Acarosporaceae", name.text_name)
+    assert_equal("Family", name.rank)
+  end
+
+  def test_create_observation_creating_group
+    generic_construct_observation(
+      { observation: { place_name: "Earth", lat: "", lng: "" },
+        naming: { name: "Morchella elata group" },
+        approved_name: "Morchella elata group" },
+      1, 1, 2
+    )
+    name = Name.last
+    assert_equal("Morchella elata group", name.text_name)
+    assert_equal("", name.author)
+    assert_equal("Group", name.rank)
+  end
+
+  def test_prevent_creation_of_species_under_deprecated_genus
+    login("katrina")
+    cladonia = Name.find_or_create_name_and_parents("Cladonia").last
+    cladonia.save!
+    cladonia_picta = Name.find_or_create_name_and_parents("Cladonia picta").last
+    cladonia_picta.save!
+    cladina = Name.find_or_create_name_and_parents("Cladina").last
+    cladina.change_deprecated(true)
+    cladina.save!
+    cladina.merge_synonyms(cladonia)
+
+    generic_construct_observation(
+      { observation: { place_name: "Earth" },
+        naming: { name: "Cladina pictum" } },
+      0, 0, 0, roy
+    )
+    assert_names_equal(cladina, assigns(:parent_deprecated))
+    assert_obj_arrays_equal([cladonia_picta], assigns(:valid_names))
+
+    generic_construct_observation(
+      { observation: { place_name: "Earth" },
+        naming: { name: "Cladina pictum" },
+        approved_name: "Cladina pictum" },
+      1, 1, 1, roy
+    )
+
+    name = Name.last
+    assert_equal("Cladina pictum", name.text_name)
+    assert_true(name.deprecated)
+  end
+
+  def test_construct_observation_dubious_place_names
+    # Test a reversed name with a scientific user
+    where = "USA, Massachusetts, Reversed"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0, roy
+    )
+
+    # Test missing space.
+    where = "Reversible, Massachusetts,USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      0, 0, 0
+    )
+    # (This is accepted now for some reason.)
+    where = "USA,Massachusetts, Reversible"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0, roy
+    )
+
+    # Test a bogus country name
+    where = "Bogus, Massachusetts, UAS"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      0, 0, 0
+    )
+    where = "UAS, Massachusetts, Bogus"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      0, 0, 0, roy
+    )
+
+    # Test a bad state name
+    where = "Bad State Name, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      0, 0, 0
+    )
+    where = "USA, Bad State Name"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      0, 0, 0, roy
+    )
+
+    # Test mix of city and county
+    where = "Burbank, Los Angeles Co., California, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+    where = "USA, California, Los Angeles Co., Burbank"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0, roy
+    )
+
+    # Test mix of city and county
+    where = "Falmouth, Barnstable Co., Massachusetts, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+    where = "USA, Massachusetts, Barnstable Co., Falmouth"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0, roy
+    )
+
+    # Test some bad terms
+    where = "Some County, Ohio, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      0, 0, 0
+    )
+    where = "Old Rd, Ohio, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      0, 0, 0
+    )
+    where = "Old Rd., Ohio, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+
+    # Test some acceptable additions
+    where = "near Burbank, Southern California, USA"
+    generic_construct_observation(
+      { observation: { place_name: where }, naming: { name: "Unknown" } },
+      1, 0, 0
+    )
+  end
+
+  def test_name_resolution
+    login("rolf")
+
+    params = {
+      observation: {
+        when: Time.zone.now,
+        place_name: "Somewhere, Massachusetts, USA",
+        specimen: "0",
+        thumb_image_id: "0"
+      },
+      naming: {
+        vote: { value: "3" }
+      }
+    }
+    expected_page = new_location_path
+
+    # Can we create observation with existing genus?
+    agaricus = names(:agaricus)
+    params[:naming][:name] = "Agaricus"
+    params[:approved_name] = nil
+    post(:create, params: params)
+    # assert_template(action: expected_page)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+
+    params[:naming][:name] = "Agaricus sp"
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+
+    params[:naming][:name] = "Agaricus sp."
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+
+    # Can we create observation with genus and add author?
+    params[:naming][:name] = "Agaricus Author"
+    params[:approved_name] = "Agaricus Author"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+    assert_equal("Agaricus Author", agaricus.reload.search_name)
+    agaricus.author = nil
+    agaricus.search_name = "Agaricus"
+    agaricus.save
+
+    params[:naming][:name] = "Agaricus sp Author"
+    params[:approved_name] = "Agaricus sp Author"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+    assert_equal("Agaricus Author", agaricus.reload.search_name)
+    agaricus.author = nil
+    agaricus.search_name = "Agaricus"
+    agaricus.save
+
+    params[:naming][:name] = "Agaricus sp. Author"
+    params[:approved_name] = "Agaricus sp. Author"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+    assert_equal("Agaricus Author", agaricus.reload.search_name)
+
+    # Can we create observation with genus specifying author?
+    params[:naming][:name] = "Agaricus Author"
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+
+    params[:naming][:name] = "Agaricus sp Author"
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+
+    params[:naming][:name] = "Agaricus sp. Author"
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(agaricus.id, assigns(:observation).name_id)
+
+    # Can we create observation with deprecated genus?
+    psalliota = names(:psalliota)
+    params[:naming][:name] = "Psalliota"
+    params[:approved_name] = "Psalliota"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(psalliota.id, assigns(:observation).name_id)
+
+    params[:naming][:name] = "Psalliota sp"
+    params[:approved_name] = "Psalliota sp"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(psalliota.id, assigns(:observation).name_id)
+
+    params[:naming][:name] = "Psalliota sp."
+    params[:approved_name] = "Psalliota sp."
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(psalliota.id, assigns(:observation).name_id)
+
+    # Can we create observation with deprecated genus, adding author?
+    params[:naming][:name] = "Psalliota Author"
+    params[:approved_name] = "Psalliota Author"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(psalliota.id, assigns(:observation).name_id)
+    assert_equal("Psalliota Author", psalliota.reload.search_name)
+    psalliota.author = nil
+    psalliota.search_name = "Psalliota"
+    psalliota.save
+
+    params[:naming][:name] = "Psalliota sp Author"
+    params[:approved_name] = "Psalliota sp Author"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(psalliota.id, assigns(:observation).name_id)
+    assert_equal("Psalliota Author", psalliota.reload.search_name)
+    psalliota.author = nil
+    psalliota.search_name = "Psalliota"
+    psalliota.save
+
+    params[:naming][:name] = "Psalliota sp. Author"
+    params[:approved_name] = "Psalliota sp. Author"
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal(psalliota.id, assigns(:observation).name_id)
+    assert_equal("Psalliota Author", psalliota.reload.search_name)
+
+    # Can we create new quoted genus?
+    params[:naming][:name] = '"One"'
+    params[:approved_name] = '"One"'
+    post(:create, params: params)
+    # assert_template(controller: :observations, action: expected_page)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One"', assigns(:observation).name.text_name)
+    assert_equal('"One"', assigns(:observation).name.search_name)
+
+    params[:naming][:name] = '"Two" sp'
+    params[:approved_name] = '"Two" sp'
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"Two"', assigns(:observation).name.text_name)
+    assert_equal('"Two"', assigns(:observation).name.search_name)
+
+    params[:naming][:name] = '"Three" sp.'
+    params[:approved_name] = '"Three" sp.'
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"Three"', assigns(:observation).name.text_name)
+    assert_equal('"Three"', assigns(:observation).name.search_name)
+
+    params[:naming][:name] = '"One"'
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One"', assigns(:observation).name.text_name)
+
+    params[:naming][:name] = '"One" sp'
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One"', assigns(:observation).name.text_name)
+
+    params[:naming][:name] = '"One" sp.'
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One"', assigns(:observation).name.text_name)
+
+    # Can we create species under the quoted genus?
+    params[:naming][:name] = '"One" foo'
+    params[:approved_name] = '"One" foo'
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One" foo', assigns(:observation).name.text_name)
+
+    params[:naming][:name] = '"One" "bar"'
+    params[:approved_name] = '"One" "bar"'
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One" "bar"', assigns(:observation).name.text_name)
+
+    params[:naming][:name] = '"One" Author'
+    params[:approved_name] = '"One" Author'
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One"', assigns(:observation).name.text_name)
+    assert_equal('"One" Author', assigns(:observation).name.search_name)
+
+    params[:naming][:name] = '"One" sp Author'
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One"', assigns(:observation).name.text_name)
+    assert_equal('"One" Author', assigns(:observation).name.search_name)
+
+    params[:naming][:name] = '"One" sp. Author'
+    params[:approved_name] = nil
+    post(:create, params: params)
+    assert_redirected_to(/#{expected_page}/)
+    assert_equal('"One"', assigns(:observation).name.text_name)
+    assert_equal('"One" Author', assigns(:observation).name.search_name)
+  end
+
+  def test_create_observation_strip_images
+    login("rolf")
+
+    setup_image_dirs
+    fixture = "#{MO.root}/test/images/geotagged.jpg"
+    fixture = Rack::Test::UploadedFile.new(fixture, "image/jpeg")
+
+    old_img1 = images(:turned_over_image)
+    old_img2 = images(:in_situ_image)
+    assert_false(old_img1.gps_stripped)
+    assert_false(old_img2.gps_stripped)
+    assert_false(old_img1.transferred)
+    assert_false(old_img2.transferred)
+
+    orig_file = old_img1.full_filepath("orig")
+    path = orig_file.sub(%r{/[^/]*$}, "")
+    FileUtils.mkdir_p(path) unless File.directory?(path)
+    FileUtils.cp(fixture, orig_file)
+
+    post(
+      :create,
+      params: {
+        observation: {
+          when: Time.zone.now,
+          place_name: "Burbank, California, USA",
+          lat: "45.4545",
+          lng: "-90.1234",
+          alt: "456",
+          specimen: "0",
+          thumb_image_id: "0",
+          gps_hidden: "1"
+        },
+        image: {
+          "0" => {
+            image: fixture,
+            copyright_holder: "me",
+            when: Time.zone.now
+          }
+        },
+        good_image_ids: "#{old_img1.id} #{old_img2.id}"
+      }
+    )
+
+    obs = Observation.last
+    assert_equal(3, obs.images.length)
+    new_img = (obs.images - [old_img1, old_img2]).first
+    assert_true(new_img.gps_stripped)
+    # We have script/process_image disabled for tests, so it doesn't actually
+    # strip the uploaded image.
+    # assert_not_equal(File.size(fixture),
+    #                  File.size(new_img.full_filepath("orig")))
+
+    # Make sure it stripped the image which had already been created.
+    assert_true(old_img1.reload.gps_stripped)
+    assert_not_equal(File.size(fixture),
+                     File.size(old_img1.full_filepath("orig")))
+
+    # Second pre-existing image has missing file, so stripping should fail.
+    assert_false(old_img2.reload.gps_stripped)
+  end
+
+  # -----------------------------------
+  #  Test extended observation forms.
+  # -----------------------------------
+
+  def test_javascripty_name_reasons
+    login("rolf")
+
+    # If javascript isn't enabled, then checkbox isn't required.
+    post(:create,
+         params: {
+           observation: { place_name: "Where, Japan", when: Time.zone.now },
+           naming: {
+             name: names(:coprinus_comatus).text_name,
+             vote: { value: 3 },
+             reasons: {
+               "1" => { check: "0", notes: "" },
+               "2" => { check: "0", notes: "foo" },
+               "3" => { check: "1", notes: ""    },
+               "4" => { check: "1", notes: "bar" }
+             }
+           }
+         })
+    assert_response(:redirect) # redirected = successfully created
+    naming = Naming.find(assigns(:naming).id)
+    reasons = naming.reasons_array.select(&:used?).map(&:num).sort
+    assert_equal([2, 3, 4], reasons)
+
+    # If javascript IS enabled, then checkbox IS required.
+    post(:create,
+         params: {
+           observation: { place_name: "Where, Japan", when: Time.zone.now },
+           naming: {
+             name: names(:coprinus_comatus).text_name,
+             vote: { value: 3 },
+             reasons: {
+               "1" => { check: "0", notes: "" },
+               "2" => { check: "0", notes: "foo" },
+               "3" => { check: "1", notes: ""    },
+               "4" => { check: "1", notes: "bar" }
+             }
+           },
+           was_js_on: "yes"
+         })
+    assert_response(:redirect) # redirected = successfully created
+    naming = Naming.find(assigns(:naming).id)
+    reasons = naming.reasons_array.select(&:used?).map(&:num).sort
+    assert_equal([3, 4], reasons)
+  end
+
+  def test_create_with_image_upload
+    login("rolf")
+
+    time0 = Time.utc(2000)
+    time1 = Time.utc(2001)
+    time2 = Time.utc(2002)
+    time3 = Time.utc(2003)
+    week_ago = 1.week.ago
+
+    setup_image_dirs
+    file = Rails.root.join("test/images/Coprinus_comatus.jpg")
+    file1 = Rack::Test::UploadedFile.new(file, "image/jpeg")
+    file2 = Rack::Test::UploadedFile.new(file, "image/jpeg")
+    file3 = Rack::Test::UploadedFile.new(file, "image/jpeg")
+
+    new_image1 = Image.create(
+      copyright_holder: "holder_1",
+      when: time1,
+      notes: "notes_1",
+      user_id: users(:rolf).id,
+      image: file1,
+      content_type: "image/jpeg",
+      created_at: week_ago
+    )
+
+    new_image2 = Image.create(
+      copyright_holder: "holder_2",
+      when: time2,
+      notes: "notes_2",
+      user_id: users(:rolf).id,
+      image: file2,
+      content_type: "image/jpeg",
+      created_at: week_ago
+    )
+
+    # assert(new_image1.updated_at < 1.day.ago)
+    # assert(new_image2.updated_at < 1.day.ago)
+    File.stub(:rename, false) do
+      post(
+        :create,
+        params: {
+          observation: {
+            place_name: "Zzyzx, Japan",
+            when: time0,
+            thumb_image_id: 0, # (make new image the thumbnail)
+            notes: { Observation.other_notes_key => "blah" }
+          },
+          image: {
+            "0" => {
+              image: file3,
+              copyright_holder: "holder_3",
+              when: time3,
+              notes: "notes_3"
+            }
+          },
+          good_image: {
+            new_image1.id.to_s => {},
+            new_image2.id.to_s => {
+              notes: "notes_2_new"
+            }
+          },
+          # (attach these two images once observation created)
+          good_image_ids: "#{new_image1.id} #{new_image2.id}"
+        }
+      )
+    end
+    assert_response(:redirect) # redirected = successfully created
+
+    obs = Observation.find_by(where: "Zzyzx, Japan")
+    assert_equal(rolf.id, obs.user_id)
+    assert_equal(time0, obs.when)
+    assert_equal("Zzyzx, Japan", obs.place_name)
+
+    new_image1.reload
+    new_image2.reload
+    imgs = obs.images.sort_by(&:id)
+    img_ids = imgs.map(&:id)
+    assert_equal([new_image1.id, new_image2.id, new_image2.id + 1], img_ids)
+    assert_equal(new_image2.id + 1, obs.thumb_image_id)
+    assert_equal("holder_1", imgs[0].copyright_holder)
+    assert_equal("holder_2", imgs[1].copyright_holder)
+    assert_equal("holder_3", imgs[2].copyright_holder)
+    assert_equal(time1, imgs[0].when)
+    assert_equal(time2, imgs[1].when)
+    assert_equal(time3, imgs[2].when)
+    assert_equal("notes_1",     imgs[0].notes)
+    assert_equal("notes_2_new", imgs[1].notes)
+    assert_equal("notes_3",     imgs[2].notes)
+    # assert(imgs[0].updated_at < 1.day.ago) # notes not changed
+    # assert(imgs[1].updated_at > 1.day.ago) # notes changed
+  end
+
+  def test_image_upload_when_create_fails
+    login("rolf")
+
+    setup_image_dirs
+    file = Rails.root.join("test/images/Coprinus_comatus.jpg")
+    file = Rack::Test::UploadedFile.new(file, "image/jpeg")
+    File.stub(:rename, false) do
+      post(
+        :create,
+        params: {
+          observation: {
+            place_name: "", # will cause failure
+            when: Time.zone.now
+          },
+          image: { "0": { image: file,
+                          copyright_holder: "zuul",
+                          when: Time.zone.now } }
+        }
+      )
+      assert_response(:success) # success = failure, paradoxically
+    end
+    # Make sure image was created, but that it is unattached, and that it has
+    # been kept in the @good_images array for attachment later.
+    img = Image.find_by(copyright_holder: "zuul")
+    assert(img)
+    assert_equal([], img.observations)
+    assert_equal([img.id],
+                 @controller.instance_variable_get(:@good_images).map(&:id))
+  end
+
+  def test_image_upload_when_process_image_fails
+    setup_image_dirs
+    file = Rails.root.join("test/images/Coprinus_comatus.jpg")
+    file = Rack::Test::UploadedFile.new(file, "image/jpeg")
+    image = Image.create(user: users(:rolf),
+                         copyright_holder: "zuul",
+                         when: Time.current,
+                         notes: "stubbed in test")
+    params = {
+      observation: { place_name: "USA",
+                     when: Time.current },
+      image: {
+        "0" => {
+          image: file,
+          copyright_holder: "zuul",
+          when: Time.current
+        }
+      }
+    }
+    login("rolf")
+
+    # Simulate process_image failure.
+    Image.stub(:new, image) do
+      image.stub(:process_image, false) do
+        post(:create, params: params)
+      end
+    end
+
+    img = Image.find_by(copyright_holder: "zuul")
+
+    assert(img, "Failed to create image")
+    assert_equal([], img.observations, "Image should be unattached")
+    assert_includes(@controller.instance_variable_get(:@bad_images), img,
+                    "Failed to include image in @bad_images")
+    assert_empty(@controller.instance_variable_get(:@good_images),
+                 "Incorrectly included image in @good_images")
+  end
+
+  # --------------------------------------------------------------------
+  #  Test notes with template
+  # --------------------------------------------------------------------
+
+  # Prove that create_observation renders note fields with template keys first,
+  # in the order listed in the template
+  def test_new_observation_with_notes_template
+    user = users(:notes_templater)
+    login(user.login)
+    get(:new)
+
+    assert_page_has_correct_notes_areas(
+      expect_areas: { Cap: "", Nearby_trees: "", odor: "", Other: "" }
+    )
+  end
+
+  def test_notes_to_name
+    login("katrina")
+    name = names(:coprinus_comatus)
+    get(:new, params: { notes: { Field_Slip_ID: name.text_name } })
+
+    assert_match(name.text_name, @response.body)
+  end
+
+  # Prove that notes are saved with template keys first, in the order listed in
+  # the template, then Other, but without blank fields
+  def test_create_observation_with_notes_template
+    user = users(:notes_templater)
+    params = { observation: sample_obs_fields }
+    # Use defined Location to avoid issues with reloading Observation
+    params[:observation][:place_name] = locations(:albion).name
+    params[:observation][:notes] = {
+      Nearby_trees: "?",
+      Observation.other_notes_key => "Some notes",
+      odor: "",
+      Cap: "red"
+    }
+    expected_notes = {
+      Cap: "red",
+      Nearby_trees: "?",
+      Observation.other_notes_key => "Some notes"
+    }
+    o_size = Observation.count
+
+    login(user.login)
+    post(:create, params: params)
+
+    assert_equal(o_size + 1, Observation.count)
+    obs = Observation.last.reload
+    assert_redirected_to(action: :show, id: obs.id)
+    assert_equal(expected_notes, obs.notes)
+  end
+end
diff --git a/test/controllers/observations_controller/observations_controller_destroy_test.rb b/test/controllers/observations_controller/observations_controller_destroy_test.rb
new file mode 100644
index 0000000000..31a9216f23
--- /dev/null
+++ b/test/controllers/observations_controller/observations_controller_destroy_test.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require("test_helper")
+
+class ObservationsControllerDestroyTest < FunctionalTestCase
+  tests ObservationsController
+
+  ##############################################################################
+
+  # -------------------- Destroy ---------------------------------------- #
+
+  def test_destroy_observation
+    assert(obs = observations(:minimal_unknown_obs))
+    id = obs.id
+    params = { id: id }
+    assert_equal("mary", obs.user.login)
+    requires_user(:destroy,
+                  [{ action: :show }],
+                  params, "mary")
+    assert_redirected_to(action: :index)
+    assert_raises(ActiveRecord::RecordNotFound) do
+      obs = Observation.find(id)
+    end
+  end
+
+  def test_original_filename_visibility
+    login("mary")
+    obs_id = observations(:agaricus_campestris_obs).id
+
+    rolf.keep_filenames = "toss"
+    rolf.save
+    get(:show, params: { id: obs_id })
+    assert_false(@response.body.include?("áč€εиts"))
+
+    rolf.keep_filenames = "keep_but_hide"
+    rolf.save
+    get(:show, params: { id: obs_id })
+    assert_false(@response.body.include?("áč€εиts"))
+
+    rolf.keep_filenames = "keep_and_show"
+    rolf.save
+    get(:show, params: { id: obs_id })
+    assert_true(@response.body.include?("áč€εиts"))
+
+    login("rolf") # owner
+
+    rolf.keep_filenames = "toss"
+    rolf.save
+    get(:show, params: { id: obs_id })
+    assert_true(@response.body.include?("áč€εиts"))
+
+    rolf.keep_filenames = "keep_but_hide"
+    rolf.save
+    get(:show, params: { id: obs_id })
+    assert_true(@response.body.include?("áč€εиts"))
+
+    rolf.keep_filenames = "keep_and_show"
+    rolf.save
+    get(:show, params: { id: obs_id })
+    assert_true(@response.body.include?("áč€εиts"))
+  end
+end
diff --git a/test/controllers/observations_controller/observations_controller_index_test.rb b/test/controllers/observations_controller/observations_controller_index_test.rb
new file mode 100644
index 0000000000..1bcb1b1bb2
--- /dev/null
+++ b/test/controllers/observations_controller/observations_controller_index_test.rb
@@ -0,0 +1,630 @@
+# frozen_string_literal: true
+
+require("test_helper")
+
+class ObservationsControllerShowIndexTest < FunctionalTestCase
+  tests ObservationsController
+
+  ######## Index ################################################
+  # Tests of index, with tests arranged as follows:
+  # default subaction; then
+  # other subactions in order of @index_subaction_param_keys
+  # miscellaneous tests using get(:index)
+
+  # First, test that the index does not require login - AN 20230923
+  def test_index_no_login
+    # login
+    get(:index)
+
+    assert_template("shared/_matrix_box")
+    assert_displayed_title("Observations by #{:sort_by_rss_log.l}")
+  end
+
+  def test_index_sorted_by_name
+    by = "name"
+
+    login
+    get(:index, params: { by: by })
+
+    assert_displayed_title("Observations by #{by.capitalize}")
+  end
+
+  def test_index_sorted_by_user
+    by = "user"
+
+    login
+    get(:index, params: { by: by })
+
+    assert_displayed_title("Observations by #{by.capitalize}")
+  end
+
+  def test_index_sorted_by_invalid_order
+    by = "edibility"
+
+    login
+
+    exception = assert_raise(RuntimeError) do
+      get(:index, params: { by: by })
+    end
+    assert_equal("Can't figure out how to sort Observations by :#{by}.",
+                 exception.message)
+  end
+
+  def test_index_with_id
+    obs = observations(:agaricus_campestris_obs)
+
+    login
+    get(:index, params: { id: obs.id })
+
+    assert_template("shared/_matrix_box")
+    assert_displayed_title("Observation Index")
+    assert_select(
+      "#results .rss-heading a[href ^= '/#{obs.id}'] .rss-name",
+      { text: obs.format_name.t.strip_html },
+      "Index should open at the page that includes #{obs.format_name}"
+    )
+    assert_select("#results a", { text: "« Prev" },
+                  "Wrong page or display is missing a link to Prev page")
+  end
+
+  # Created in response to a bug seen in the wild
+  # place_name isn't a param for Observation#index
+  # but is an API param and a param for Observation#create
+  def test_index_useless_param
+    params = { place_name: "Burbank" }
+
+    login
+    get(:index, params: params)
+
+    assert_displayed_title("Observations by #{:sort_by_rss_log.l}")
+  end
+
+  def test_index_useless_param_page2
+    params = { place_name: "Burbank", page: 2 }
+
+    login
+    get(:index, params: params)
+
+    assert_displayed_title("Observations by #{:sort_by_rss_log.l}")
+    assert_select("#results a", { text: "« Prev" },
+                  "Wrong page or display is missing a link to Prev page")
+  end
+
+  def test_index_advanced_search_name_and_location_multiple_hits
+    name = "Agaricus"
+    location = "California"
+    expected_hits = Observation.where(Observation[:text_name] =~ name).
+                    where(Observation[:where] =~ location).
+                    count
+
+    login
+    get(:index,
+        params: { name: name, location: location,
+                  advanced_search: "1" })
+
+    assert_response(:success)
+    assert_displayed_title("Advanced Search")
+    assert_select(
+      "#results .rss-what a:match('href', ?)", %r{^/\d},
+      { count: expected_hits },
+      "Wrong number of results"
+    )
+  end
+
+  def test_index_advanced_search_name_one_hit
+    obs = observations(:strobilurus_diminutivus_obs)
+    search_string = obs.text_name
+    query = Query.lookup_and_save(:Observation, :advanced_search,
+                                  name: search_string)
+    assert(query.results.one?,
+           "Test needs a string that has exactly one hit")
+
+    login
+    get(:index,
+        params: @controller.query_params(query).merge(advanced_search: true))
+
+    assert_match(/#{obs.id}/, redirect_to_url,
+                 "Advanced Search with 1 hit should show the hit")
+  end
+
+  def test_index_advanced_search_no_hits
+    query = Query.lookup_and_save(:Observation, :advanced_search,
+                                  name: "Don't know",
+                                  user: "myself",
+                                  content: "Long pink stem and small pink cap",
+                                  location: "Eastern Oklahoma")
+
+    login
+    get(:index,
+        params: @controller.query_params(query).merge({ advanced_search: "1" }))
+
+    assert_select("title", { text: "#{:app_title.l}: Index" },
+                  "Wrong page or metadata <title>")
+    assert_displayed_title("")
+    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
+  end
+
+  def test_index_advanced_search_notes1
+    login
+    get(:index,
+        params: {
+          name: "Fungi",
+          location: "String in notes",
+          # Deliberately omit search_location_notes: 1
+          advanced_search: "1"
+        })
+
+    assert_response(:success)
+    assert_select("title", { text: "#{:app_title.l}: Index" },
+                  "Wrong page or metadata <title>")
+    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
+    assert_select(
+      "#results a", false,
+      "There should be no results when string is missing from notes, " \
+      "and search_location_notes param is missing"
+    )
+  end
+
+  def test_index_advanced_search_notes2
+    login
+    # Include notes, but notes don't have string yet!
+    get(
+      :index,
+      params: {
+        name: "Fungi",
+        location: '"String in notes"',
+        search_location_notes: 1,
+        advanced_search: "1"
+      }
+    )
+
+    assert_response(:success)
+    assert_select("title", { text: "#{:app_title.l}: Index" },
+                  "Wrong page or metadata <title>")
+    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
+    assert_select(
+      "#results a", false,
+      "There should be no results when string is missing from notes, " \
+      "even if search_location_notes param is true"
+    )
+  end
+
+  def test_index_advanced_search_notes3
+    # Add string to notes, make sure it is actually added.
+    login("rolf")
+    loc = locations(:burbank)
+    loc.notes = "blah blah blahString in notesblah blah blah"
+    loc.save
+    loc.reload
+    assert(loc.notes.to_s.include?("String in notes"))
+
+    login
+    # Forget to include notes again.
+    get(:index,
+        params: {
+          name: "Fungi",
+          location: "String in notes",
+          # Deliberately omit search_location_notes: 1
+          advanced_search: "1"
+        })
+
+    assert_response(:success)
+    assert_select("title", { text: "#{:app_title.l}: Index" },
+                  "Wrong page or metadata <title>")
+    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
+    assert_select(
+      "#results a", false,
+      "There should be no results when notes include search string, " \
+      "if search_location_notes param is missing"
+    )
+  end
+
+  def test_index_advanced_search_notes4
+    # Add string to notes, make sure it is actually added.
+    login("rolf")
+    loc = locations(:burbank)
+    loc.notes = "blah blah blahString in notesblah blah blah"
+    loc.save
+    loc.reload
+    assert(loc.notes.to_s.include?("String in notes"))
+
+    login
+    # Now it should finally find the three unknowns at Burbank because Burbank
+    # has the magic string in its notes, and we're looking for it.
+    get(:index,
+        params: {
+          name: "Fungi",
+          location: '"String in notes"',
+          search_location_notes: 1,
+          advanced_search: "1"
+        })
+
+    assert_response(:success)
+    results = @controller.instance_variable_get(:@objects)
+    assert_equal(3, results.length)
+  end
+
+  def test_index_advanced_search_error
+    query = Query.lookup_and_save(:Observation, :advanced_search, name: "Fungi")
+
+    login
+    @controller.stub(:show_selected_observations, -> { raise(RuntimeError) }) do
+      get(:index,
+          params: @controller.query_params(query).merge(
+            { advanced_search: "1" }
+          ))
+    end
+
+    assert_redirected_to(
+      search_advanced_path,
+      "Advanced Search should reload form if it throws an error"
+    )
+  end
+
+  def test_index_pattern_search_help
+    login
+    get(:index, params: { pattern: "help:me" })
+
+    assert_flash_error
+    assert_match(/unexpected term/i, @response.body)
+  end
+
+  def test_index_pattern_multiple_hits
+    pattern = "Agaricus"
+
+    login
+    get(:index, params: { pattern: pattern })
+
+    # Because this pattern is a name, the title will reflect that Query is
+    # assuming this is a search by name with synonyms and subtaxa.
+    assert_displayed_title("Observations of #{pattern}")
+    assert_select(
+      "#results a:match('href', ?)", %r{^/\d+},
+      { text: /#{pattern}/i,
+        count: Observation.where(Observation[:text_name] =~ /#{pattern}/i).
+               count },
+      "Wrong number of results displayed"
+    )
+  end
+
+  def test_index_pattern_needs_naming_with_filter
+    pattern = "Briceland"
+
+    login
+    get(:index, params: { pattern: pattern, needs_naming: true })
+
+    assert_displayed_title("")
+    assert_match(/^#{identify_observations_url}/, redirect_to_url,
+                 "Wrong page. Should redirect to #{:obs_needing_id.l}")
+  end
+
+  def test_index_pattern1
+    pattern = "Boletus edulis"
+
+    login
+    get(:index, params: { pattern: pattern })
+
+    # assert_displayed_title("Observations Matching ‘#{pattern}’")
+    assert_displayed_title(
+      :query_title_of_name.t(types: "Observations", name: pattern)
+    )
+    assert_not_empty(css_select('[id="right_tabs"]').text, "Tabset is empty")
+  end
+
+  def test_index_pattern_page2
+    pattern = "Boletus edulis"
+
+    login
+    get(:index, params: { pattern: pattern, page: 2 })
+
+    # assert_displayed_title("Observations Matching ‘#{pattern}’")
+    assert_displayed_title(
+      :query_title_of_name.t(types: "Observations", name: pattern)
+    )
+    assert_not_empty(css_select('[id="right_tabs"]').text, "Tabset is empty")
+    assert_select("#results a", { text: "« Prev" },
+                  "Wrong page or display is missing a link to Prev page")
+  end
+
+  def test_index_pattern_no_hits
+    pattern = "no hits"
+
+    login
+    get(:index, params: { pattern: pattern })
+
+    assert_empty(css_select('[id="right_tabs"]').text,
+                 "RH tabset should be empty when search has no hits")
+    assert_displayed_title(:title_for_observation_search.l)
+  end
+
+  def test_index_pattern_one_hit
+    obs = observations(:two_img_obs)
+
+    login
+    get(:index, params: { pattern: obs.id })
+
+    assert_match(/#{obs.id}/, redirect_to_url,
+                 "Search with 1 hit should show the hit")
+  end
+
+  def test_index_pattern_bad_pattern
+    pattern = { error: "" }
+
+    login
+    get(:index, params: { pattern: pattern })
+
+    assert_response(:success)
+    assert_flash_error
+    assert_displayed_title("")
+    assert_select("#results", { text: "" }, "There should be no results")
+  end
+
+  def test_index_pattern_bad_pattern_from_needs_naming
+    pattern = { error: "" }
+
+    login
+    get(:index, params: { pattern: pattern, needs_naming: true })
+
+    assert_redirected_to(
+      identify_observations_path,
+      "Bad pattern in search from obs_needing_ids should render " \
+      "obs_needing_ids"
+    )
+  end
+
+  def test_index_look_alikes
+    obs = observations(:owner_only_favorite_ne_consensus)
+    name = obs.name
+    look_alikes = Observation.joins(:namings).
+                  where(namings: { name: name }).
+                  where.not(name: name).count
+    assert(look_alikes > 1, "Test needs different fixture")
+
+    login
+    get(:index, params: { look_alikes: "1", name: name.id })
+
+    assert_displayed_title("Observations of #{name.text_name}")
+    assert_select(
+      "#results a:match('href', ?)", %r{^/\d+},
+      { count: look_alikes },
+      "Wrong number of results displayed"
+    )
+  end
+
+  def test_index_look_alikes_no_hits
+    obs = observations(:strobilurus_diminutivus_obs)
+    name = obs.name
+    look_alikes = Observation.joins(:namings).
+                  where(namings: { name: name }).
+                  where.not(name: name).count
+    assert(look_alikes.zero?, "Test needs different fixture")
+
+    login
+    get(:index, params: { look_alikes: "1", name: name.id })
+
+    assert_response(:success)
+    assert_displayed_title("")
+    assert_select(
+      "#results a:match('href', ?)", %r{^/\d+},
+      { count: look_alikes },
+      "Wrong number of results displayed"
+    )
+  end
+
+  def test_index_related_taxa
+    name = names(:tremella_mesenterica)
+    parent = name.parents.first
+    obss_of_related_taxa =
+      Observation.where(
+        name: Name.where(Name[:text_name] =~ /#{parent.text_name} /).or(
+          Name.where(Name[:classification] =~ /: _#{parent.text_name}_/)
+        ).or(Name.where(id: parent.id))
+      )
+
+    login
+    get(:index, params: { related_taxa: "1", name: name.text_name })
+    assert_displayed_title("Observations of #{parent.text_name}")
+    assert_select(
+      "#results a:match('href', ?)", %r{^/\d+},
+      { count: obss_of_related_taxa.count },
+      "Wrong number of results displayed"
+    )
+  end
+
+  def test_index_name
+    name = names(:fungi)
+    ids = Observation.where(name: name).map(&:id)
+    assert(ids.length.positive?, "Test needs different fixture for 'name'")
+    params = { name: name }
+
+    login("zero") # Has no observations
+    get(:index, params: params)
+
+    assert_response(:success)
+    assert_displayed_title("Observations of #{name.text_name}")
+    ids.each do |id|
+      assert_select(
+        "a:match('href', ?)", %r{^/#{id}}, true,
+        "Observations of Name should link to each Observation of Name"
+      )
+    end
+  end
+
+  def test_index_user_by_known_user
+    # Make sure fixtures are still okay
+    obs = observations(:coprinus_comatus_obs)
+    assert_not_nil(obs.rss_log_id)
+    assert_not_nil(obs.thumb_image_id)
+    user = rolf
+    assert(
+      user.layout_count >= user.observations.size,
+      "User must be able to display all rolf's Observations in a single page"
+    )
+
+    test_show_owner_id_noone_logged_in
+
+    login(user.login)
+    get(:index, params: { user: user.id })
+
+    assert_displayed_title("Observations created by #{user.name}")
+    assert_select(
+      "#results img.image_#{obs.thumb_image_id}",
+      true,
+      "Observation thumbnail should display although this is not an rss_log"
+    )
+    assert_select(
+      "#results a:match('href', ?)", %r{^/\d+},
+      { text: /\S+/, # ignore links in buttons
+        count: Observation.where(user: user).count },
+      "Wrong number of results displayed"
+    )
+  end
+
+  def test_show_owner_id_noone_logged_in
+    logout
+    get(
+      :show, params: { id: observations(:owner_only_favorite_ne_consensus).id }
+    )
+    assert_select("#owner_naming", { count: 0 },
+                  "Do not show Observer ID when nobody logged in")
+  end
+
+  def test_index_user_unknown_user
+    user = observations(:minimal_unknown_obs)
+
+    login
+    get(:index, params: { user: user })
+
+    assert_equal(users_url, redirect_to_url, "Wrong page")
+    assert_flash_text(:runtime_object_not_found.l(type: :user.l, id: user.id))
+  end
+
+  def test_index_location_with_observations
+    location = locations(:obs_default_location)
+    params = { location: location.id }
+
+    login
+    get(:index, params: params)
+
+    assert_displayed_title("Observations from #{location.title_display_name}")
+  end
+
+  def test_index_location_without_observations
+    location = locations(:unused_location)
+    params = { location: location }
+    flash_matcher = Regexp.new(
+      Regexp.escape_except_spaces(
+        :runtime_no_matches.t(type: :observation)
+      )
+    )
+
+    login
+    get(:index, params: params)
+
+    assert_response(:success)
+    assert_flash(flash_matcher)
+    assert_displayed_title("")
+  end
+
+  def test_index_location_with_nonexistent_location
+    location = "non-existent"
+    params = { location: location }
+    flash_matcher = Regexp.new(
+      Regexp.escape_except_spaces(
+        :runtime_object_not_found.t(type: :location, id: location)
+      )
+    )
+
+    login
+    get(:index, params: params)
+
+    assert_flash(flash_matcher)
+    assert_redirected_to(locations_path)
+  end
+
+  def test_index_where
+    location = locations(:obs_default_location)
+
+    login
+    get(:index, params: { where: location.name })
+
+    assert_displayed_title("Observations from ‘#{location.name}’")
+  end
+
+  def test_index_where_page2
+    location = locations(:obs_default_location)
+
+    login
+    get(:index, params: { where: location.name, page: 2 })
+
+    assert_displayed_title("Observations from ‘#{location.name}’")
+    assert_not_empty(css_select('[id="right_tabs"]').text, "Tabset is empty")
+    assert_select("#results a", { text: "« Prev" },
+                  "Wrong page or display is missing a link to Prev page")
+  end
+
+  def test_index_project
+    project = projects(:bolete_project)
+
+    login
+    get(:index, params: { project: project.id })
+
+    assert_response(:success)
+    assert_displayed_title("Observations for #{project.title}")
+  end
+
+  def test_index_project_without_observations
+    project = projects(:empty_project)
+
+    login
+    get(:index, params: { project: project.id })
+
+    assert_response(:success)
+    assert_displayed_title("")
+  end
+
+  # Prove that lichen content_filter works on observations
+  def test_index_with_lichen_filter_only_lichens
+    user = users(:lichenologist)
+
+    login(user.name)
+    get(:index)
+
+    results = @controller.instance_variable_get(:@objects)
+
+    assert(results.many?)
+    assert(results.all? { |result| result.lifeform.include?("lichen") },
+           "All results should be lichen-ish")
+  end
+
+  def test_index_with_lichen_filter_hide_lichens
+    user = users(:antilichenologist)
+
+    login(user.name)
+    get(:index)
+
+    results = @controller.instance_variable_get(:@objects)
+
+    assert(results.many?)
+    assert(results.none? { |result| result.lifeform.include?(" lichen ") },
+           "No results should be lichens")
+  end
+
+  def test_index_with_region_filter
+    observations_in_region = Observation.where(
+      Observation[:where].matches("%California, USA")
+    ).order(:id).to_a
+
+    user = users(:californian)
+    # Make sure the fixture is still okay
+    assert_equal({ region: "California, USA" }, user.content_filter)
+    assert(user.layout_count >= observations_in_region.size,
+           "User must be able to display search results in a single page.")
+
+    login(user.name)
+    get(:index)
+
+    results = @controller.instance_variable_get(:@objects).sort_by(&:id)
+    assert_obj_arrays_equal(observations_in_region, results)
+  end
+end
diff --git a/test/controllers/observations_controller/observations_controller_project_list_test.rb b/test/controllers/observations_controller/observations_controller_project_list_test.rb
new file mode 100644
index 0000000000..d0dc719e1c
--- /dev/null
+++ b/test/controllers/observations_controller/observations_controller_project_list_test.rb
@@ -0,0 +1,326 @@
+# frozen_string_literal: true
+
+require("test_helper")
+
+class ObservationsControllerProjectListTest < FunctionalTestCase
+  tests ObservationsController
+
+  def test_inital_project_checkboxes
+    login("foray_newbie")
+    get(:new)
+
+    assert_project_checks(
+      # open membership, meets date constrains
+      projects(:current_project).id => :checked,
+      # open-membership, doesn't meet date constraints
+      projects(:past_project).id => :unchecked,
+      # meets date constraints, but not a member
+      projects(:eol_project).id => :no_field
+    )
+  end
+
+  def test_field_slip_project_checkbox
+    login("katrina")
+    slip = field_slips(:field_slip_no_obs)
+    get(:new, params: { field_code: slip.code })
+
+    User.current.project_members.each do |membership|
+      proj = membership.project
+      if proj == slip.project || (proj.current? && proj.field_slip_prefix.nil?)
+        assert_project_checks(proj.id => :checked)
+      else
+        assert_project_checks(proj.id => :unchecked)
+      end
+    end
+  end
+
+  def test_project_checkboxes_in_create_observation
+    init_for_project_checkbox_tests
+
+    login("dick")
+    get(:new)
+    assert_project_checks(@proj1.id => :no_field, @proj2.id => :unchecked)
+
+    # Should have different default
+    # if recently posted observation attached to project.
+    obs = Observation.create!
+    @proj2.add_observation(obs)
+    get(:new)
+    assert_project_checks(@proj1.id => :no_field, @proj2.id => :checked)
+
+    # Make sure it remember state of checks if submit fails.
+    post(:create,
+         params: {
+           naming: { name: "Screwy Name" }, # (ensures it will fail)
+           project: { "id_#{@proj1.id}" => "0" }
+         })
+    assert_project_checks(@proj1.id => :no_field, @proj2.id => :unchecked)
+  end
+
+  def test_project_checkboxes_in_update_observation
+    init_for_project_checkbox_tests
+
+    login("rolf")
+    get(:edit, params: { id: @obs1.id })
+    assert_response(:redirect)
+    get(:edit, params: { id: @obs2.id })
+    assert_project_checks(@proj1.id => :unchecked, @proj2.id => :no_field)
+    put(
+      :update,
+      params: {
+        id: @obs2.id,
+        observation: { place_name: "blah blah blah" }, # (ensures it will fail)
+        project: { "id_#{@proj1.id}" => "1" },
+        good_image_ids: @obs2_img_ids.join(" ") # necessary?
+      }
+    )
+    assert_project_checks(@proj1.id => :checked, @proj2.id => :no_field)
+    put(
+      :update,
+      params: {
+        id: @obs2.id,
+        project: { "id_#{@proj1.id}" => "1" },
+        good_image_ids: @obs2_img_ids.join(" ") # necessary?
+      }
+    )
+    assert_response(:redirect)
+    assert_obj_arrays_equal([@proj1], @obs2.reload.projects)
+    assert_obj_arrays_equal([@proj1], @img2.reload.projects)
+
+    login("mary")
+    get(:edit, params: { id: @obs2.id })
+    assert_project_checks(@proj1.id => :checked, @proj2.id => :unchecked)
+    get(:edit, params: { id: @obs1.id })
+    assert_project_checks(@proj1.id => :unchecked, @proj2.id => :checked)
+    put(
+      :update,
+      params: {
+        id: @obs1.id,
+        observation: { place_name: "blah blah blah" }, # (ensures it will fail)
+        project: {
+          "id_#{@proj1.id}" => "1",
+          "id_#{@proj2.id}" => "0"
+        },
+        good_image_ids: @obs1_img_ids.join(" ")
+      }
+    )
+    assert_project_checks(@proj1.id => :checked, @proj2.id => :unchecked)
+    put(
+      :update,
+      params: {
+        id: @obs1.id,
+        project: {
+          "id_#{@proj1.id}" => "1",
+          "id_#{@proj2.id}" => "1"
+        },
+        good_image_ids: @obs1_img_ids.join(" ")
+      }
+    )
+    assert_response(:redirect)
+    assert_obj_arrays_equal([@proj1, @proj2], @obs1.reload.projects, :sort)
+    assert_obj_arrays_equal([@proj1, @proj2], @img1.reload.projects, :sort)
+
+    login("dick")
+    get(:edit, params: { id: @obs2.id })
+    assert_response(:redirect)
+    get(:edit, params: { id: @obs1.id })
+    assert_project_checks(@proj1.id => :checked_but_disabled,
+                          @proj2.id => :checked)
+  end
+
+  def init_for_project_checkbox_tests
+    @proj1 = projects(:eol_project)
+    @proj2 = projects(:bolete_project)
+    @obs1 = observations(:detailed_unknown_obs)
+    @obs2 = observations(:coprinus_comatus_obs)
+    @obs1_imgs = @obs1.images
+    @obs2_imgs = @obs2.images
+    @img1 = @obs1_imgs.first
+    @img2 = @obs2_imgs.first
+    @obs1_img_ids = @obs1_imgs.map(&:id)
+    @obs2_img_ids = @obs2_imgs.map(&:id)
+  end
+
+  def assert_project_checks(project_states)
+    project_states.each do |id, state|
+      assert_checkbox_state("project_id_#{id}", state)
+    end
+  end
+
+  def test_project_observation_location
+    project = projects(:albion_project)
+    obs = observations(:california_obs)
+
+    login("dick")
+    put(
+      :update,
+      params: {
+        id: obs.id,
+        observation: { place_name: obs.place_name },
+        project: { "id_#{project.id}" => "1" }
+      }
+    )
+    assert_flash_warning
+    assert_project_checks(project.id => :checked)
+    put(
+      :update,
+      params: {
+        id: obs.id,
+        observation: { place_name: obs.place_name },
+        project: {
+          "id_#{project.id}" => "1",
+          :ignore_proj_conflicts => "1"
+        }
+      }
+    )
+    assert_flash_success
+    assert_response(:redirect)
+    assert_obj_arrays_equal([project], obs.reload.projects)
+  end
+
+  def test_no_warning_for_associated_projects
+    project = projects(:albion_project)
+    obs = observations(:california_obs)
+    obs.projects << project
+    obs.save!
+
+    login("dick")
+    put(
+      :update,
+      params: {
+        id: obs.id,
+        observation: { place_name: obs.place_name },
+        project: { "id_#{project.id}" => "1" }
+      }
+    )
+    assert_no_flash
+    assert_response(:redirect)
+  end
+
+  def test_project_observation_good_location
+    project = projects(:wrangel_island_project)
+    obs = observations(:perkatkun_obs)
+
+    login("dick")
+    put(
+      :update,
+      params: {
+        id: obs.id,
+        observation: { place_name: obs.place_name },
+        project: { "id_#{project.id}" => "1" }
+      }
+    )
+    assert_response(:redirect)
+    assert_obj_arrays_equal([project], obs.reload.projects)
+  end
+
+  def test_list_checkboxes_in_create_observation
+    init_for_list_checkbox_tests
+
+    login("rolf")
+    get(:new)
+    assert_list_checks(@spl1.id => :unchecked, @spl2.id => :no_field)
+
+    login("mary")
+    get(:new)
+    assert_list_checks(@spl1.id => :no_field, @spl2.id => :unchecked)
+
+    login("katrina")
+    get(:new)
+    assert_list_checks(@spl1.id => :no_field, @spl2.id => :no_field)
+
+    # Dick is on project that owns @spl2.
+    login("dick")
+    get(:new)
+    assert_list_checks(@spl1.id => :no_field, @spl2.id => :unchecked)
+
+    # Should have different default
+    # if recently posted observation attached to project.
+    obs = Observation.create!
+    @spl1.add_observation(obs) # (shouldn't affect anything for create)
+    @spl2.add_observation(obs)
+    get(:new)
+    assert_list_checks(@spl1.id => :no_field, @spl2.id => :checked)
+
+    # Make sure it remember state of checks if submit fails.
+    post(
+      :create,
+      params: {
+        naming: { name: "Screwy Name" }, # (ensures it will fail)
+        list: { "id_#{@spl2.id}" => "0" }
+      }
+    )
+    assert_list_checks(@spl1.id => :no_field, @spl2.id => :unchecked)
+  end
+
+  def test_edit_observation_form_no_open
+    obs = observations(:amateur_obs)
+    project = projects(:open_membership_project)
+    login("katrina")
+    get(:edit, params: { id: obs.id })
+    assert_project_checks(project.id => :unchecked)
+  end
+
+  def test_list_checkboxes_in_update_observation
+    init_for_list_checkbox_tests
+
+    login("rolf")
+    get(:edit, params: { id: @obs1.id })
+    assert_list_checks(@spl1.id => :unchecked, @spl2.id => :no_field)
+    spl_start_length = @spl1.observations.length
+    put(
+      :update,
+      params: {
+        id: @obs1.id,
+        observation: { place_name: "blah blah blah" }, # (ensures it will fail)
+        list: { "id_#{@spl1.id}" => "1" }
+      }
+    )
+    assert_equal(spl_start_length, @spl1.reload.observations.length)
+    assert_list_checks(@spl1.id => :checked, @spl2.id => :no_field)
+    put(
+      :update,
+      params: {
+        id: @obs1.id,
+        list: { "id_#{@spl1.id}" => "1" }
+      }
+    )
+    assert_equal(spl_start_length + 1, @spl1.reload.observations.length)
+    assert_response(:redirect)
+    assert_obj_arrays_equal([@spl1], @obs1.reload.species_lists)
+    get(:edit, params: { id: @obs2.id })
+    assert_response(:redirect)
+
+    login("mary")
+    get(:edit, params: { id: @obs1.id })
+    assert_response(:redirect)
+    get(:edit, params: { id: @obs2.id })
+    assert_list_checks(@spl1.id => :no_field, @spl2.id => :checked)
+    @spl1.add_observation(@obs2)
+    get(:edit, params: { id: @obs2.id })
+    assert_list_checks(@spl1.id => :checked_but_disabled, @spl2.id => :checked)
+
+    login("dick")
+    get(:edit, params: { id: @obs2.id })
+    assert_list_checks(@spl1.id => :checked_but_disabled, @spl2.id => :checked)
+  end
+
+  def init_for_list_checkbox_tests
+    @spl1 = species_lists(:first_species_list)
+    @spl2 = species_lists(:unknown_species_list)
+    @obs1 = observations(:unlisted_rolf_obs)
+    @obs2 = observations(:detailed_unknown_obs)
+    assert_users_equal(rolf, @spl1.user)
+    assert_users_equal(mary, @spl2.user)
+    assert_users_equal(rolf, @obs1.user)
+    assert_users_equal(mary, @obs2.user)
+    assert_obj_arrays_equal([], @obs1.species_lists)
+    assert_obj_arrays_equal([@spl2], @obs2.species_lists)
+  end
+
+  def assert_list_checks(list_states)
+    list_states.each do |id, state|
+      assert_checkbox_state("list_id_#{id}", state)
+    end
+  end
+end
diff --git a/test/controllers/observations_controller/observations_controller_show_test.rb b/test/controllers/observations_controller/observations_controller_show_test.rb
new file mode 100644
index 0000000000..2dcf866bdb
--- /dev/null
+++ b/test/controllers/observations_controller/observations_controller_show_test.rb
@@ -0,0 +1,766 @@
+# frozen_string_literal: true
+
+require("test_helper")
+
+class ObservationsControllerShowTest < FunctionalTestCase
+  tests ObservationsController
+
+  ##############################################################################
+
+  # ----------------------------
+  #  General tests.
+  # ----------------------------
+
+  # Test load a deprecated name obs, no strict_loading error
+  def test_show_observation_deprecated_name
+    obs = observations(:deprecated_name_obs)
+    get(:show, params: { id: obs.id })
+  end
+
+  def test_show_observation_noteless_image
+    obs = observations(:peltigera_mary_obs)
+    img = images(:rolf_profile_image)
+    assert_nil(img.notes)
+    assert(obs.images.member?(img))
+    get(:show, params: { id: obs.id })
+  end
+
+  def test_show_observation_noteful_image
+    obs = observations(:detailed_unknown_obs)
+    get(:show, params: { id: obs.id })
+  end
+
+  def test_show_project_observation
+    login
+    obs = observations(:owner_accepts_general_questions)
+    project = obs.projects[0]
+    get(:show, params: { id: obs.id })
+    assert_match(project.title, @response.body)
+  end
+
+  def test_show_observation_change_thumbnail_size
+    user = users(:small_thumbnail_user)
+    login(user.name)
+    obs = observations(:detailed_unknown_obs)
+    get(:show, params: { id: obs.id, set_thumbnail_size: "thumbnail" })
+    user.reload
+    assert_equal("thumbnail", user.thumbnail_size)
+  end
+
+  def test_show_observation_vague_location
+    login
+    obs1 = observations(:california_obs)
+    get(:show, params: { id: obs1.id })
+    assert_match(:show_observation_vague_location.l, @response.body)
+    assert_no_match(:show_observation_improve_location.l, @response.body)
+
+    # Make sure it suggests choosing a better location if owner is current user
+    login("dick")
+    get(:show, params: { id: obs1.id })
+    assert_match(:show_observation_vague_location.l, @response.body)
+    assert_match(:show_observation_improve_location.l, @response.body)
+
+    # Make sure it doesn't show for observations with non-vague location
+    obs2 = observations(:amateur_obs)
+    get(:show, params: { id: obs2.id })
+    assert_no_match(:show_observation_vague_location.l, @response.body)
+  end
+
+  def test_show_observation_hidden_gps
+    obs = observations(:unknown_with_lat_lng)
+    login
+    get(:show, params: { id: obs.id })
+    assert_match(/34.1622|118.3521/, @response.body)
+
+    obs.update(gps_hidden: true)
+    get(:show, params: { id: obs.id })
+    assert_no_match(/34.1622|118.3521/, @response.body)
+
+    login("mary")
+    get(:show, params: { id: obs.id })
+    assert_match(/34.1622|118.3521/, @response.body)
+    assert_match(:show_observation_gps_hidden.t, @response.body)
+
+    login("roy")
+    get(:show, params: { id: obs.id })
+    assert_match(/34.1622|118.3521/, @response.body)
+    assert_match(:show_observation_gps_hidden.t, @response.body)
+  end
+
+  def test_show_obs_view_stats
+    obs = observations(:minimal_unknown_obs)
+    assert_empty(ObservationView.where(observation: obs))
+    login
+    get(:show, params: { id: obs.id })
+    assert_equal(1, ObservationView.where(observation: obs).count)
+    assert_select("p.footer-view-stats") do |p|
+      assert_includes(p.to_s, :footer_viewed.t(date: :footer_never.l,
+                                               times: :many_times.l(num: 0)))
+    end
+
+    last_view = 1.hour.ago
+    obs.update!(last_view: last_view)
+    login("dick")
+    get(:show, params: { id: obs.id })
+    assert_equal(2, ObservationView.where(observation: obs).count)
+    assert_operator(obs.last_viewed_by(dick), :>=, 2.seconds.ago)
+    assert_select("p.footer-view-stats") do |p|
+      assert_includes(p.to_s, :footer_viewed.t(date: last_view.web_time,
+                                               times: :one_time.l))
+      assert_includes(p.to_s, :footer_last_you_viewed.t(date: :footer_never.l))
+    end
+
+    last_view = 2.months.ago
+    obs.update!(last_view: last_view)
+    obs.observation_views.where(user: dick).first.update!(last_view: last_view)
+    get(:show, params: { id: obs.id })
+    assert_equal(2, ObservationView.where(observation: obs).count)
+    assert_operator(obs.last_viewed_by(dick), :>=, 2.seconds.ago)
+    assert_select("p.footer-view-stats") do |p|
+      assert_includes(p.to_s, :footer_viewed.t(date: last_view.web_time,
+                                               times: :many_times.l(num: 2)))
+      assert_includes(p.to_s,
+                      :footer_last_you_viewed.t(date: last_view.web_time))
+    end
+  end
+
+  ##############################################################################
+
+  # ------ Show ----------------------------------------------- #
+
+  def test_show_observation_num_views
+    login
+    obs = observations(:coprinus_comatus_obs)
+    updated_at = obs.updated_at
+    num_views = obs.num_views
+    last_view = obs.last_view
+    # obs.update_view_stats
+    get(:show, params: { id: obs.id })
+    obs.reload
+    assert_equal(num_views + 1, obs.num_views)
+    assert_not_equal(last_view, obs.last_view)
+    assert_equal(updated_at, obs.updated_at)
+  end
+
+  def assert_show_observation
+    assert_template("observations/show")
+    assert_template("observations/show/_name_info")
+    assert_template("observations/show/_observation_details")
+    # assert_template("observations/show/_namings") now a helper
+    assert_template("comments/_comments_for_object")
+    assert_template("observations/show/_thumbnail_map")
+  end
+
+  # Refactored for CRUD routes in :collection_numbers or :herbarium_records
+  def assert_show_obs(types, _id, items, can_add)
+    type = types.to_s.chop
+    selector = types == :collection_numbers && !can_add ? "i" : "li"
+    assert_select("#observation_#{types} #{selector}",
+                  items.count,
+                  "Wrong number of #{types} shown.")
+    if can_add
+      assert(response.body.match(%r{href="/#{types}/new}),
+             "Expected to find a create link for #{types}.")
+    else
+      assert_not(response.body.match(%r{href="/#{types}/new}),
+                 "Expected not to find a create link for #{types}.")
+    end
+
+    items.each do |type_id, can_edit|
+      if can_edit
+        assert(response.body.match(%r{href="/#{types}/#{type_id}/edit}),
+               "Expected to find an edit link for #{type} #{type_id}.")
+      else
+        assert_not(
+          response.body.match(%r{href="/#{types}/#{type_id}/edit}),
+          "Expected not to find an edit link for #{type} #{type_id}."
+        )
+      end
+    end
+  end
+
+  def test_show_observation
+    login
+    assert_equal(0, QueryRecord.count)
+
+    # Test it on obs with no namings first.
+    obs = observations(:unknown_with_no_naming)
+    get(:show, params: { id: obs.id })
+    assert_show_observation
+
+    # You must be logged in to get the show_obs naming table now.
+    # Test it on obs with two namings (Rolf's and Mary's), with owner logged in.
+    obs = observations(:coprinus_comatus_obs)
+    rolf_nmg = obs.namings.first
+    consensus = Observation::NamingConsensus.new(obs)
+    get(:show, params: { id: obs.id })
+    assert_show_observation
+    assert_form_action(controller: "observations/namings/votes",
+                       action: :update, naming_id: rolf_nmg.id,
+                       observation_id: obs.id,
+                       id: consensus.users_vote(rolf_nmg, rolf))
+
+    # Test it on obs with two namings, with non-owner logged in.
+    login("mary")
+    obs = observations(:coprinus_comatus_obs)
+    get(:show, params: { id: obs.id })
+    assert_show_observation
+    assert_form_action(controller: "observations/namings/votes",
+                       action: :update, naming_id: rolf_nmg.id,
+                       observation_id: obs.id,
+                       id: consensus.users_vote(rolf_nmg, mary))
+
+    # Test a naming owned by the observer but the observer has 'No Opinion'.
+    # Ensure that rolf owns @obs_with_no_opinion.
+    user = login("rolf")
+    obs = observations(:strobilurus_diminutivus_obs)
+    assert_equal(obs.user, user)
+    get(:show, params: { id: obs.id })
+    assert_show_observation
+
+    # Make sure no queries created for show_image links.
+    assert_empty(QueryRecord.where("description like '%model=:Image%'"))
+  end
+
+  def test_show_observation_change_vote_anonymity
+    obs = observations(:coprinus_comatus_obs)
+    user = login(users(:public_voter).name)
+
+    get(:show, params: { id: obs.id, go_private: 1 })
+    user.reload
+    assert_equal("yes", user.votes_anonymous)
+
+    get(:show, params: { id: obs.id, go_public: 1 })
+    user.reload
+    assert_equal("no", user.votes_anonymous)
+  end
+
+  def test_show_owner_naming
+    login(user_with_view_owner_id_true)
+    obs = observations(:owner_only_favorite_ne_consensus)
+    consensus = Observation::NamingConsensus.new(obs)
+
+    get(:show, params: { id: obs.id })
+    assert_select("#owner_naming",
+                  { text: /#{consensus.owner_preference.text_name}/,
+                    count: 1 },
+                  "Observation should show owner's preferred naming")
+
+    get(
+      :show, params: { id: observations(:owner_multiple_favorites).id }
+    )
+    assert_select("#owner_naming",
+                  { text: /#{:show_observation_no_clear_preference.t}/,
+                    count: 1 },
+                  "Observation should show lack of owner naming preference")
+  end
+
+  def test_show_owner_naming_view_owner_id_false
+    login(user_with_view_owner_id_false)
+    get(
+      :show, params: { id: observations(:owner_only_favorite_ne_consensus).id }
+    )
+    assert_select(
+      "#owner_naming", { count: 0 },
+      "Do not show owner's preferred naming when user has not opted for it"
+    )
+  end
+
+  def user_with_view_owner_id_true
+    users(:rolf).login
+  end
+
+  def user_with_view_owner_id_false
+    users(:dick).login
+  end
+
+  def test_observation_external_links_exist
+    login
+    obs_id = observations(:coprinus_comatus_obs).id
+    get(:show, params: { id: obs_id })
+
+    assert_select("a[href *= 'images.google.com']")
+    assert_select("a[href *= 'mycoportal.org']")
+
+    # There is a MycoBank link which includes taxon name and MycoBank language
+    assert_select("a[href *= 'mycobank.org']") do
+      assert_select("a[href *= '/Coprinus%20comatus']")
+    end
+  end
+
+  def test_show_observation_edit_links
+    obs = observations(:detailed_unknown_obs)
+    proj = projects(:bolete_project)
+    assert_equal(mary.id, obs.user_id)  # owned by mary
+    assert(obs.projects.include?(proj)) # owned by bolete project
+
+    login("rolf") # Can't edit
+    get(:show, params: { id: obs.id })
+    assert_select("a:match('href',?)", edit_observation_path(obs.id), count: 0)
+    assert_select(".destroy_observation_link_#{obs.id}", count: 0)
+    assert_select("a:match('href',?)",
+                  new_image_for_observation_path(obs.id), count: 0)
+    assert_select("a:match('href',?)",
+                  remove_images_from_observation_path(obs.id), count: 0)
+    assert_select("a:match('href',?)",
+                  reuse_images_for_observation_path(obs.id), count: 0)
+    get(:edit, params: { id: obs.id })
+    assert_response(:redirect)
+    get(:destroy, params: { id: obs.id })
+    assert_flash_error
+
+    login("mary") # Owner
+    get(:show, params: { id: obs.id })
+    assert_select("a[href=?]", edit_observation_path(obs.id), minimum: 1)
+    # Destroy button is in a form, not a link_to
+    assert_select(".destroy_observation_link_#{obs.id}", minimum: 1)
+    assert_select("a[href=?]",
+                  new_image_for_observation_path(obs.id), minimum: 1)
+    assert_select("a[href=?]",
+                  remove_images_from_observation_path(obs.id), minimum: 1)
+    assert_select("a[href=?]",
+                  reuse_images_for_observation_path(obs.id), minimum: 1)
+    get(:edit, params: { id: obs.id })
+    assert_response(:success)
+
+    login("dick") # Project permission
+    get(:show, params: { id: obs.id })
+    assert_select("a[href=?]", edit_observation_path(obs.id), minimum: 1)
+    # Destroy button is in a form, not a link_to
+    assert_select(".destroy_observation_link_#{obs.id}", minimum: 1)
+    assert_select("a[href=?]",
+                  new_image_for_observation_path(obs.id), minimum: 1)
+    assert_select("a[href=?]",
+                  remove_images_from_observation_path(obs.id), minimum: 1)
+    assert_select("a[href=?]",
+                  reuse_images_for_observation_path(obs.id), minimum: 1)
+    get(:edit, params: { id: obs.id })
+    assert_response(:success)
+    get(:destroy, params: { id: obs.id })
+    assert_flash_success
+  end
+
+  def test_show_observation_specimen_stuff
+    obs1 = observations(:strobilurus_diminutivus_obs)
+    obs2 = observations(:minimal_unknown_obs)
+    obs3 = observations(:detailed_unknown_obs)
+    observations(:locally_sequenced_obs).sequences.
+      first.update(observation: obs2)
+    observations(:genbanked_obs).sequences.
+      each { |s| s.update(observation: obs3) }
+    obs2.reload
+    obs3.reload
+
+    # Obs1 has nothing, owned by rolf, not in project.
+    assert_users_equal(rolf, obs1.user)
+    assert_empty(obs1.projects)
+    assert_empty(obs1.collection_numbers)
+    assert_empty(obs1.herbarium_records)
+    assert_empty(obs1.sequences)
+
+    # Obs2 owned by mary, not in project,
+    # one collection_number owned by mary,
+    # one herbarium_record owned by rolf at NY (roy is curator),
+    # one sequence owned by rolf.
+    assert_users_equal(mary, obs2.user)
+    assert_empty(obs2.projects)
+    assert_operator(obs2.collection_numbers.count, :==, 1)
+    assert_operator(obs2.herbarium_records.count, :==, 1)
+    assert_operator(obs2.sequences.count, :==, 1)
+    assert_false(obs2.herbarium_records.first.can_edit?(mary))
+    assert_true(obs2.herbarium_records.first.can_edit?(rolf))
+    assert_true(obs2.herbarium_records.first.can_edit?(roy))
+
+    # Obs3 owned by mary, in bolete project (dick admin and member),
+    # two collection_numbers owned by mary,
+    # two herbarium_records, one owned by rolf at NY,
+    #   one owned by mary at FunDiS,
+    # several sequences all owned by dick.
+    assert_users_equal(mary, obs3.user)
+    assert_equal("Bolete Project", obs3.projects.first.title)
+    assert_true(obs3.can_edit?(dick))
+    assert_operator(obs3.collection_numbers.count, :>, 1)
+    assert_operator(obs3.herbarium_records.count, :>, 1)
+    assert_operator(obs3.sequences.count, :>, 1)
+
+    # Katrina isn't associated in any way with any of these observations.
+    login("katrina")
+    get(:show, params: { id: obs1.id })
+    assert_show_obs(:collection_numbers, obs1.id, [], false)
+    assert_show_obs(:herbarium_records, obs1.id, [], false)
+    # But any logged-in user can add sequence to any observation.
+    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
+                  "Observation page should show an Add Sequence link for " \
+                  "any logged-in user")
+
+    get(:show, params: { id: obs2.id })
+    assert_show_obs(:collection_numbers, obs2.id,
+                    [[obs2.collection_numbers.first.id, false]],
+                    false)
+    assert_show_obs(:herbarium_records, obs2.id,
+                    [[obs2.herbarium_records.first.id, false]],
+                    false)
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs3.id })
+    assert_show_obs(:collection_numbers, obs3.id,
+                    obs3.collection_numbers.map { |x| [x.id, false] },
+                    false)
+    assert_show_obs(:herbarium_records, obs3.id,
+                    obs3.herbarium_records.map { |x| [x.id, false] },
+                    false)
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    # Roy is a curator at NY, so can add herbarium records, and modify existing
+    # herbarium records attached to NY.
+    login("roy")
+    assert_true(roy.curated_herbaria.any?)
+    get(:show, params: { id: obs1.id })
+    assert_show_obs(:collection_numbers, obs1.id, [], false)
+    assert_show_obs(:herbarium_records, obs1.id, [], true)
+    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
+                  "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs2.id })
+    assert_show_obs(:collection_numbers, obs2.id,
+                    [[obs2.collection_numbers.first.id, false]],
+                    false)
+    assert_show_obs(:herbarium_records, obs2.id,
+                    [[obs2.herbarium_records.first.id, true]],
+                    true)
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs3.id })
+    assert_show_obs(:collection_numbers, obs3.id,
+                    obs3.collection_numbers.map { |x| [x.id, false] },
+                    false)
+    assert_show_obs(:herbarium_records, obs3.id,
+                    obs3.herbarium_records.map { |x| [x.id, x.can_edit?(roy)] },
+                    true)
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    # Dick owns all of the sequences, is on obs3's project, and has a personal
+    # herbarium.
+    login("dick")
+    get(:show, params: { id: obs1.id })
+    assert_show_obs(:collection_numbers, obs1.id, [], false)
+    assert_show_obs(:herbarium_records, obs1.id, [], true)
+    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
+                  "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs2.id })
+    assert_show_obs(:collection_numbers, obs2.id,
+                    [[obs2.collection_numbers.first.id, false]],
+                    false)
+    assert_show_obs(:herbarium_records, obs2.id,
+                    [[obs2.herbarium_records.first.id, false]],
+                    true)
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs3.id })
+    assert_show_obs(:collection_numbers, obs3.id,
+                    obs3.collection_numbers.map { |x| [x.id, true] },
+                    true)
+    assert_show_obs(:herbarium_records, obs3.id,
+                    obs3.herbarium_records.map { |x| [x.id, false] },
+                    true)
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
+                  { count: 1 },
+                  "Observation page missing an Add Sequence link")
+
+    # Rolf owns obs1 and owns one herbarium record for both obs2 and obs3,
+    # and he is a curator at NYBG.
+    login("rolf")
+    get(:show, params: { id: obs1.id })
+    assert_show_obs(:collection_numbers, obs1.id, [], true)
+    assert_show_obs(:herbarium_records, obs1.id, [], true)
+    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
+                  "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs2.id })
+    assert_show_obs(:collection_numbers, obs2.id,
+                    [[obs2.collection_numbers.first.id, false]],
+                    false)
+    assert_show_obs(:herbarium_records, obs2.id,
+                    [[obs2.herbarium_records.first.id, true]],
+                    true)
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs3.id })
+    assert_show_obs(:collection_numbers, obs3.id,
+                    obs3.collection_numbers.map { |x| [x.id, false] }, false)
+    assert_show_obs(
+      :herbarium_records, obs3.id,
+      obs3.herbarium_records.map { |x| [x.id, x.can_edit?(rolf)] },
+      true
+    )
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
+                  { count: 1 },
+                  "Observation page missing an Add Sequence link")
+
+    # Mary owns obs2 and obs3, but has nothing to do with obs1.
+    login("mary")
+    get(:show, params: { id: obs1.id })
+    assert_show_obs(:collection_numbers, obs1.id, [], false)
+    assert_show_obs(:herbarium_records, obs1.id, [], false)
+    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
+                  "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs2.id })
+    assert_show_obs(
+      :collection_numbers, obs2.id,
+      [[obs2.collection_numbers.first.id, true]],
+      true
+    )
+    assert_show_obs(
+      :herbarium_records, obs2.id,
+      [[obs2.herbarium_records.first.id, false]],
+      true
+    )
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs3.id })
+    assert_show_obs(
+      :collection_numbers, obs3.id,
+      obs3.collection_numbers.map { |x| [x.id, true] },
+      true
+    )
+    assert_show_obs(
+      :herbarium_records, obs3.id,
+      obs3.herbarium_records.map { |x| [x.id, x.can_edit?(mary)] },
+      true
+    )
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    # Make sure admins can do everything.
+    make_admin("katrina")
+    get(:show, params: { id: obs1.id })
+    assert_show_obs(:collection_numbers, obs1.id, [], true)
+    assert_show_obs(:herbarium_records, obs1.id, [], true)
+    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
+                  "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs2.id })
+    assert_show_obs(
+      :collection_numbers, obs2.id,
+      [[obs2.collection_numbers.first.id, true]],
+      true
+    )
+    assert_show_obs(
+      :herbarium_records, obs2.id,
+      [[obs2.herbarium_records.first.id, true]],
+      true
+    )
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+
+    get(:show, params: { id: obs3.id })
+    assert_show_obs(
+      :collection_numbers, obs3.id,
+      obs3.collection_numbers.map { |x| [x.id, true] },
+      true
+    )
+    assert_show_obs(
+      :herbarium_records, obs3.id,
+      obs3.herbarium_records.map { |x| [x.id, true] },
+      true
+    )
+    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
+                  { count: 1 }, "Observation page missing an Add Sequence link")
+  end
+
+  def test_prev_and_next_observation_simple
+    # Uses non-default observation query. :when is the default order
+    o_chron = Observation.order(created_at: :desc, id: :desc)
+    login
+    # need to save a query here to get :next in a non-standard order
+    Query.lookup_and_save(:Observation, :all, by: :created_at)
+    qr = QueryRecord.last.id.alphabetize
+
+    get(:show, params: { id: o_chron.fourth.id, flow: :next, q: qr })
+    assert_redirected_to(action: :show, id: o_chron.fifth.id, q: qr)
+
+    get(:show, params: { id: o_chron.fourth.id, flow: :prev, q: qr })
+    assert_redirected_to(action: :show, id: o_chron.third.id, q: qr)
+  end
+
+  def test_prev_and_next_observation_with_fancy_query
+    n1 = names(:agaricus_campestras)
+    n2 = names(:agaricus_campestris)
+    n3 = names(:agaricus_campestros)
+    n4 = names(:agaricus_campestrus)
+
+    n2.transfer_synonym(n1)
+    n2.transfer_synonym(n3)
+    n2.transfer_synonym(n4)
+    n1.correct_spelling = n2
+    n1.save_without_our_callbacks
+
+    o1 = n1.observations.first
+    o2 = n2.observations.first
+    o3 = n3.observations.first
+    o4 = n4.observations.first
+
+    # When requesting non-synonym observations of n2, it should include n1,
+    # since an observation of n1 was clearly intended to be an observation of
+    # n2.
+    query = Query.lookup_and_save(:Observation, :all,
+                                  names: n2.id,
+                                  include_synonyms: false,
+                                  by: :name)
+    assert_equal(2, query.num_results)
+
+    # Likewise, when requesting *synonym* observations, neither n1 nor n2
+    # should be included.
+    query = Query.lookup_and_save(:Observation, :all,
+                                  names: n2.id,
+                                  include_synonyms: true,
+                                  exclude_original_names: true,
+                                  by: :name)
+    assert_equal(2, query.num_results)
+
+    # But for our prev/next test, lets do the all-inclusive query.
+    query = Query.lookup_and_save(:Observation, :all,
+                                  names: n2.id,
+                                  include_synonyms: true,
+                                  by: :name)
+    assert_equal(4, query.num_results)
+    qp = @controller.query_params(query)
+
+    o_id = observations(:minimal_unknown_obs).id
+
+    login
+    get(:show, params: qp.merge({ id: o_id, flow: "next" }))
+    assert_redirected_to(action: :show, id: o_id, params: qp)
+    assert_flash_text(/can.*t find.*results.*index/i)
+    get(:show, params: qp.merge({ id: o1.id, flow: "next" }))
+    assert_redirected_to(action: :show, id: o2.id, params: qp)
+    get(:show, params: qp.merge({ id: o2.id, flow: "next" }))
+    assert_redirected_to(action: :show, id: o3.id, params: qp)
+    get(:show, params: qp.merge({ id: o3.id, flow: "next" }))
+    assert_redirected_to(action: :show, id: o4.id, params: qp)
+    get(:show, params: qp.merge({ id: o4.id, flow: "next" }))
+    assert_redirected_to(action: :show, id: o4.id, params: qp)
+    assert_flash_text(/no more/i)
+
+    get(:show, params: qp.merge({ id: o4.id, flow: "prev" }))
+    assert_redirected_to(action: :show, id: o3.id, params: qp)
+    get(:show, params: qp.merge({ id: o3.id, flow: "prev" }))
+    assert_redirected_to(action: :show, id: o2.id, params: qp)
+    get(:show, params: qp.merge({ id: o2.id, flow: "prev" }))
+    assert_redirected_to(action: :show, id: o1.id, params: qp)
+    get(:show, params: qp.merge({ id: o1.id, flow: "prev" }))
+    assert_redirected_to(action: :show, id: o1.id, params: qp)
+    assert_flash_text(/no more/i)
+    get(:show, params: qp.merge({ id: o_id, flow: "prev" }))
+    assert_redirected_to(action: :show, id: o_id, params: qp)
+    assert_flash_text(/can.*t find.*results.*index/i)
+  end
+  # ----------------------------
+  #  Interest.
+  # ----------------------------
+
+  def test_interest_in_show_observation
+    login("rolf")
+    minimal_unknown = observations(:minimal_unknown_obs)
+
+    # No interest in this observation yet.
+    #
+    # <img[^>]+watch.*\.png[^>]+>[\w\s]*
+    get(:show, params: { id: minimal_unknown.id })
+    assert_response(:success)
+    assert_image_link_in_html(
+      /watch.*\.png/,
+      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 1)
+    )
+    assert_image_link_in_html(
+      /ignore.*\.png/,
+      set_interest_path(type: "Observation", id: minimal_unknown.id, state: -1)
+    )
+
+    # Turn interest on and make sure there is an icon linked to delete it.
+    Interest.create(target: minimal_unknown, user: rolf, state: true)
+    get(:show, params: { id: minimal_unknown.id })
+    assert_response(:success)
+    assert_image_link_in_html(
+      /halfopen.*\.png/,
+      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 0)
+    )
+    assert_image_link_in_html(
+      /ignore.*\.png/,
+      set_interest_path(type: "Observation", id: minimal_unknown.id, state: -1)
+    )
+
+    # Destroy that interest, create new one with interest off.
+    Interest.where(user_id: rolf.id).last.destroy
+    Interest.create(target: minimal_unknown, user: rolf, state: false)
+    get(:show, params: { id: minimal_unknown.id })
+    assert_response(:success)
+    assert_image_link_in_html(
+      /halfopen.*\.png/,
+      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 0)
+    )
+    assert_image_link_in_html(
+      /watch.*\.png/,
+      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 1)
+    )
+  end
+
+  ###################
+
+  def test_index_observation_by_past_by
+    login
+    get(:index, params: { by: :modified })
+    assert_response(:success)
+
+    get(:index, params: { by: :created })
+    assert_response(:success)
+  end
+
+  def test_external_sites_user_can_add_links_to
+    # not logged in
+    do_external_sites_test([], nil, nil)
+    # dick is neither owner nor member of any site's project
+    do_external_sites_test([], dick, observations(:agaricus_campestris_obs))
+    # rolf is owner
+    do_external_sites_test(ExternalSite.all, rolf,
+                           observations(:agaricus_campestris_obs))
+    # mary is member some sites' project
+    do_external_sites_test(mary.external_sites, mary,
+                           observations(:agaricus_campestris_obs))
+    # but there is already a link on this obs
+    do_external_sites_test([], mary, observations(:coprinus_comatus_obs))
+  end
+
+  def do_external_sites_test(expect, user, obs)
+    User.current = user
+    actual = @controller.helpers.external_sites_user_can_add_links_to(obs)
+    assert_equal(expect.map(&:name), actual.map(&:name))
+  end
+
+  def test_show_observation_votes
+    obs = observations(:coprinus_comatus_obs)
+    naming1 = obs.namings.first
+    naming2 = obs.namings.last
+    vote1 = naming1.votes.find_by(user: rolf)
+    vote2 = naming2.votes.find_by(user: rolf)
+    login("rolf")
+    get(:show, params: { id: obs.id })
+    assert_response(:success)
+    assert_template("show")
+    assert_select("form#naming_vote_form_#{naming1.id} " \
+                  "select#vote_value_#{naming1.id}>" \
+                  "option[selected=selected][value='#{vote1.value}']")
+    assert_select("form#naming_vote_form_#{naming2.id} " \
+                  "select#vote_value_#{naming2.id}>" \
+                  "option[selected=selected][value='#{vote2.value}']")
+  end
+end
diff --git a/test/controllers/observations_controller/observations_controller_update_test.rb b/test/controllers/observations_controller/observations_controller_update_test.rb
new file mode 100644
index 0000000000..61001d9485
--- /dev/null
+++ b/test/controllers/observations_controller/observations_controller_update_test.rb
@@ -0,0 +1,344 @@
+# frozen_string_literal: true
+
+require("test_helper")
+
+class ObservationsControllerUpdateTest < FunctionalTestCase
+  tests ObservationsController
+
+  ##############################################################################
+
+  # ----------------------------------------------------------------
+  #  Test :edit and :update (note :update uses method: :put)
+  # ----------------------------------------------------------------
+
+  # (Sorry, these used to all be edit/update_observation, now they're
+  # confused because of the naming stuff.)
+  def test_edit_observation_form
+    obs = observations(:coprinus_comatus_obs)
+    assert_equal("rolf", obs.user.login)
+    params = { id: obs.id }
+    requires_user(:edit,
+                  [{ controller: "/observations", action: :show }],
+                  params)
+
+    assert_form_action(action: :update, id: obs.id)
+
+    # image notes field must be textarea -- not just text -- because text
+    # is inline and would drops any newlines in the image notes
+    assert_select("textarea[id = 'good_image_#{obs.images.first.id}_notes']",
+                  count: 1)
+  end
+
+  def test_update_observation
+    obs = observations(:detailed_unknown_obs)
+    updated_at = obs.rss_log.updated_at
+    new_where = "Somewhere In, Japan"
+    new_notes = { other: "blather blather blather" }
+    new_specimen = false
+    img = images(:in_situ_image)
+    params = {
+      id: obs.id,
+      observation: {
+        notes: new_notes,
+        place_name: new_where,
+        "when(1i)" => "2001",
+        "when(2i)" => "2",
+        "when(3i)" => "3",
+        specimen: new_specimen,
+        thumb_image_id: "0"
+      },
+      good_image_ids: "#{img.id} #{images(:turned_over_image).id}",
+      good_image: {
+        img.id => {
+          notes: "new notes",
+          original_name: "new name",
+          copyright_holder: "someone else",
+          "when(1i)" => "2012",
+          "when(2i)" => "4",
+          "when(3i)" => "6",
+          license_id: licenses(:ccwiki30).id
+        }
+      },
+      log_change: "1"
+    }
+    put_requires_user(
+      :update,
+      [{ controller: "/observations", action: :show }],
+      params,
+      "mary"
+    )
+    assert_redirected_to(/#{new_location_path}/)
+    assert_equal(10, rolf.reload.contribution)
+    obs = assigns(:observation)
+    assert_equal(new_where, obs.where)
+    assert_equal("2001-02-03", obs.when.to_s)
+    assert_equal(new_notes, obs.notes)
+    assert_equal(new_specimen, obs.specimen)
+    assert_not_equal(updated_at, obs.rss_log.updated_at)
+    assert_not_equal(0, obs.thumb_image_id)
+    img = img.reload
+    assert_equal("new notes", img.notes)
+    assert_equal("new name", img.original_name)
+    assert_equal("someone else", img.copyright_holder)
+    assert_equal("2012-04-06", img.when.to_s)
+    assert_equal(licenses(:ccwiki30), img.license)
+  end
+
+  def test_update_observation_no_logging
+    obs = observations(:detailed_unknown_obs)
+    updated_at = obs.rss_log.updated_at
+    where = "Somewhere, China"
+    params = {
+      id: obs.id,
+      observation: {
+        place_name: where,
+        when: obs.when,
+        notes: obs.notes,
+        specimen: obs.specimen
+      },
+      log_change: "0"
+    }
+    put_requires_user(
+      :update,
+      [{ controller: "/observations", action: :show }],
+      params,
+      "mary"
+    )
+    assert_redirected_to(/#{new_location_path}/)
+    assert_equal(10, rolf.reload.contribution)
+    obs = assigns(:observation)
+    assert_equal(where, obs.where)
+    assert_equal(updated_at, obs.rss_log.updated_at)
+  end
+
+  def test_update_observation_bad_place_name
+    obs = observations(:detailed_unknown_obs)
+    new_where = "test_update_observation"
+    new_notes = { other: "blather blather blather" }
+    new_specimen = false
+    params = {
+      id: obs.id,
+      observation: {
+        place_name: new_where,
+        "when(1i)" => "2001",
+        "when(2i)" => "2",
+        "when(3i)" => "3",
+        notes: new_notes,
+        specimen: new_specimen,
+        thumb_image_id: "0"
+      },
+      log_change: "1"
+    }
+    put_requires_user(
+      :update,
+      [{ controller: "/observations", action: :show }],
+      params,
+      "mary"
+    )
+    assert_response(:success) # Which really means failure
+  end
+
+  def test_update_observation_with_another_users_image
+    img1 = images(:in_situ_image)
+    img2 = images(:turned_over_image)
+    img3 = images(:commercial_inquiry_image)
+
+    obs = observations(:detailed_unknown_obs)
+    obs.images << img3
+    obs.save
+    obs.reload
+
+    assert_equal(img1.user_id, obs.user_id)
+    assert_equal(img2.user_id, obs.user_id)
+    assert_not_equal(img3.user_id, obs.user_id)
+
+    img_ids = obs.images.map(&:id)
+    assert_equal([img1.id, img2.id, img3.id], img_ids)
+
+    old_img1_notes = img1.notes
+    old_img3_notes = img3.notes
+
+    params = {
+      id: obs.id,
+      observation: {
+        place_name: obs.place_name,
+        when: obs.when,
+        notes: obs.notes,
+        specimen: obs.specimen,
+        thumb_image_id: "0"
+      },
+      good_image_ids: img_ids.map(&:to_s).join(" "),
+      good_image: {
+        img2.id => { notes: "new notes for two" },
+        img3.id => { notes: "new notes for three" }
+      }
+    }
+    login("mary")
+    put(:update, params: params)
+    assert_redirected_to(action: :show)
+    assert_flash_success
+    assert_equal(old_img1_notes, img1.reload.notes)
+    assert_equal("new notes for two", img2.reload.notes)
+    assert_equal(old_img3_notes, img3.reload.notes)
+  end
+
+  def test_update_observation_with_non_image
+    obs = observations(:minimal_unknown_obs)
+    file = Rack::Test::UploadedFile.new(
+      Rails.root.join("test/fixtures/projects.yml").to_s, "text/plain"
+    )
+    params = {
+      id: obs.id,
+      observation: {
+        place_name: obs.place_name,
+        when: obs.when,
+        notes: obs.notes,
+        specimen: obs.specimen,
+        thumb_image_id: "0"
+      },
+      good_image_ids: "",
+      good_image: {},
+      image: {
+        "0" => {
+          image: file,
+          when: Time.zone.now
+        }
+      }
+    }
+    login("mary")
+    put(:update, params: params)
+
+    # 200 :success means means failure!
+    assert_response(
+      :success,
+      "Expected 200 (OK), Got #{@response.status} (#{@response.message})"
+    )
+    assert_flash_error
+  end
+
+  def test_update_observation_strip_images
+    login("mary")
+    obs = observations(:detailed_unknown_obs)
+
+    setup_image_dirs
+    fixture = "#{MO.root}/test/images/geotagged.jpg"
+    fixture = Rack::Test::UploadedFile.new(fixture, "image/jpeg")
+
+    old_img1 = images(:turned_over_image)
+    old_img2 = images(:in_situ_image)
+    assert_false(old_img1.gps_stripped)
+    assert_false(old_img2.gps_stripped)
+
+    orig_file = old_img1.full_filepath("orig")
+    path = orig_file.sub(%r{/[^/]*$}, "")
+    FileUtils.mkdir_p(path) unless File.directory?(path)
+    FileUtils.cp(fixture, orig_file)
+
+    put(
+      :update,
+      params: {
+        id: obs.id,
+        observation: {
+          gps_hidden: "1"
+        },
+        good_image_ids: "#{old_img1.id} #{old_img2.id}",
+        image: {
+          "0" => {
+            image: fixture,
+            copyright_holder: "me",
+            when: Time.zone.now
+          }
+        }
+      }
+    )
+
+    obs.reload
+    old_img1.reload
+    old_img2.reload
+
+    assert_equal(3, obs.images.length)
+    new_img = (obs.images - [old_img1, old_img2]).first
+
+    assert_true(new_img.gps_stripped)
+    # We have script/process_image disabled for tests, so it doesn't actually
+    # strip the uploaded image.
+    # assert_not_equal(File.size(fixture),
+    #                  File.size(new_img.full_filepath("orig")))
+
+    # Make sure it stripped the image which had already been created.
+    assert_true(old_img1.reload.gps_stripped)
+    assert_not_equal(File.size(fixture),
+                     File.size(old_img1.full_filepath("orig")))
+
+    # Second pre-existing image has missing file, so stripping should fail.
+    assert_false(old_img2.reload.gps_stripped)
+  end
+
+  # --------------------------------------------------------------------
+  #  Test notes with template
+  # --------------------------------------------------------------------
+
+  # Prove that edit_observation has correct note fields and content:
+  # Template fields first, in template order; then orphaned fields in order
+  # in which they appear in observation, then Other
+  def test_edit_observation_with_notes_template
+    obs    = observations(:templater_noteless_obs)
+    user   = obs.user
+    params = {
+      id: obs.id,
+      observation: {
+        place_name: obs.location.name,
+        lat: "",
+        lng: "",
+        alt: "",
+        "when(1i)" => obs.when.year,
+        "when(2i)" => obs.when.month,
+        "when(3i)" => obs.when.day,
+        specimen: "0",
+        thumb_image_id: "0",
+        notes: obs.notes
+      },
+      herbarium_record: { herbarium_name: "", accession_number: "" },
+      username: user.login,
+      naming: {
+        vote: { value: "3" }
+      }
+    }
+
+    login(user.login)
+    get(:edit, params: params)
+    assert_page_has_correct_notes_areas(
+      expect_areas: { Cap: "", Nearby_trees: "", odor: "",
+                      Observation.other_notes_key => "" }
+    )
+
+    obs         = observations(:templater_other_notes_obs)
+    params[:id] = obs.id
+    params[:observation][:notes] = obs.notes
+    get(:edit, params: params)
+    assert_page_has_correct_notes_areas(
+      expect_areas: { Cap: "", Nearby_trees: "", odor: "",
+                      Observation.other_notes_key => "some notes" }
+    )
+  end
+
+  def test_update_observation_with_notes_template
+    # Prove notes_template works when editing Observation without notes
+    obs = observations(:templater_noteless_obs)
+    user = obs.user
+    notes = {
+      Cap: "dark red",
+      Nearby_trees: "?",
+      odor: "farinaceous"
+    }
+    params = {
+      id: obs.id,
+      observation: { notes: notes }
+    }
+    login(user.login)
+    put(:update, params: params)
+
+    assert_redirected_to(action: :show, id: obs.id)
+    assert_equal(notes, obs.reload.notes)
+  end
+end
diff --git a/test/controllers/observations_controller_test.rb b/test/controllers/observations_controller_test.rb
deleted file mode 100644
index a7e7dd0253..0000000000
--- a/test/controllers/observations_controller_test.rb
+++ /dev/null
@@ -1,3405 +0,0 @@
-# frozen_string_literal: true
-
-require("test_helper")
-
-class ObservationsControllerTest < FunctionalTestCase
-  def modified_generic_params(params, user)
-    params[:observation] = sample_obs_fields.merge(params[:observation] || {})
-    params[:naming][:vote] = { value: "3" }.merge(params[:naming][:vote] || {})
-    params[:collection_number] =
-      default_collection_number_fields.merge(params[:collection_number] || {})
-    params[:herbarium_record] =
-      default_herbarium_record_fields.merge(params[:herbarium_record] || {})
-    params[:username] = user.login
-    params
-  end
-
-  def sample_obs_fields
-    { place_name: "Right Here, Massachusetts, USA",
-      lat: "",
-      lng: "",
-      alt: "",
-      "when(1i)" => "2007",
-      "when(2i)" => "10",
-      "when(3i)" => "31",
-      specimen: "0",
-      thumb_image_id: "0" }
-  end
-
-  def default_collection_number_fields
-    { name: "", number: "" }
-  end
-
-  def default_herbarium_record_fields
-    { herbarium_name: "", accession_number: "" }
-  end
-
-  def location_exists_or_place_name_blank(params)
-    Location.find_by(name: params[:observation][:place_name]) ||
-      Location.is_unknown?(params[:observation][:place_name]) ||
-      params[:observation][:place_name].blank?
-  end
-
-  # Test constructing observations in various ways (with minimal namings)
-  def generic_construct_observation(params, o_num, g_num, n_num, user = rolf)
-    o_count = Observation.count
-    g_count = Naming.count
-    n_count = Name.count
-    score   = user.reload.contribution
-    params  = modified_generic_params(params, user)
-
-    post_requires_login(:create, params)
-
-    begin
-      if o_num.zero?
-        assert_response(:success)
-      elsif location_exists_or_place_name_blank(params)
-        # assert_redirected_to(action: :show)
-        assert_response(:redirect)
-        assert_match(%r{/test.host/\d+\Z}, @response.redirect_url)
-      else
-        assert_redirected_to(/#{new_location_path}/)
-      end
-    rescue Minitest::Assertion => e
-      flash = get_last_flash.to_s
-      flash.sub!(/^(\d)/, "")
-      message = "#{e}\n" \
-                "Flash messages: (level #{Regexp.last_match(1)})\n" \
-                "< #{flash} >\n"
-      flunk(message)
-    end
-    assert_equal(o_count + o_num, Observation.count, "Wrong Observation count")
-    assert_equal(g_count + g_num, Naming.count, "Wrong Naming count")
-    assert_equal(n_count + n_num, Name.count, "Wrong Name count")
-    assert_equal(score + o_num + g_num * 2 + n_num * 10,
-                 user.reload.contribution,
-                 "Wrong User score")
-    return unless o_num == 1
-
-    assert_not_equal(
-      0,
-      @controller.instance_variable_get(:@observation).thumb_image_id,
-      "Wrong image id"
-    )
-  end
-
-  ##############################################################################
-
-  # ----------------------------
-  #  General tests.
-  # ----------------------------
-
-  # Test load a deprecated name obs, no strict_loading error
-  def test_show_observation_deprecated_name
-    obs = observations(:deprecated_name_obs)
-    get(:show, params: { id: obs.id })
-  end
-
-  def test_show_observation_noteless_image
-    obs = observations(:peltigera_mary_obs)
-    img = images(:rolf_profile_image)
-    assert_nil(img.notes)
-    assert(obs.images.member?(img))
-    get(:show, params: { id: obs.id })
-  end
-
-  def test_show_observation_noteful_image
-    obs = observations(:detailed_unknown_obs)
-    get(:show, params: { id: obs.id })
-  end
-
-  def test_show_project_observation
-    login
-    obs = observations(:owner_accepts_general_questions)
-    project = obs.projects[0]
-    get(:show, params: { id: obs.id })
-    assert_match(project.title, @response.body)
-  end
-
-  def test_show_observation_change_thumbnail_size
-    user = users(:small_thumbnail_user)
-    login(user.name)
-    obs = observations(:detailed_unknown_obs)
-    get(:show, params: { id: obs.id, set_thumbnail_size: "thumbnail" })
-    user.reload
-    assert_equal("thumbnail", user.thumbnail_size)
-  end
-
-  def test_show_observation_vague_location
-    login
-    obs1 = observations(:california_obs)
-    get(:show, params: { id: obs1.id })
-    assert_match(:show_observation_vague_location.l, @response.body)
-    assert_no_match(:show_observation_improve_location.l, @response.body)
-
-    # Make sure it suggests choosing a better location if owner is current user
-    login("dick")
-    get(:show, params: { id: obs1.id })
-    assert_match(:show_observation_vague_location.l, @response.body)
-    assert_match(:show_observation_improve_location.l, @response.body)
-
-    # Make sure it doesn't show for observations with non-vague location
-    obs2 = observations(:amateur_obs)
-    get(:show, params: { id: obs2.id })
-    assert_no_match(:show_observation_vague_location.l, @response.body)
-  end
-
-  def test_show_observation_hidden_gps
-    obs = observations(:unknown_with_lat_lng)
-    login
-    get(:show, params: { id: obs.id })
-    assert_match(/34.1622|118.3521/, @response.body)
-
-    obs.update(gps_hidden: true)
-    get(:show, params: { id: obs.id })
-    assert_no_match(/34.1622|118.3521/, @response.body)
-
-    login("mary")
-    get(:show, params: { id: obs.id })
-    assert_match(/34.1622|118.3521/, @response.body)
-    assert_match(:show_observation_gps_hidden.t, @response.body)
-
-    login("roy")
-    get(:show, params: { id: obs.id })
-    assert_match(/34.1622|118.3521/, @response.body)
-    assert_match(:show_observation_gps_hidden.t, @response.body)
-  end
-
-  def test_show_obs_view_stats
-    obs = observations(:minimal_unknown_obs)
-    assert_empty(ObservationView.where(observation: obs))
-    login
-    get(:show, params: { id: obs.id })
-    assert_equal(1, ObservationView.where(observation: obs).count)
-    assert_select("p.footer-view-stats") do |p|
-      assert_includes(p.to_s, :footer_viewed.t(date: :footer_never.l,
-                                               times: :many_times.l(num: 0)))
-    end
-
-    last_view = 1.hour.ago
-    obs.update!(last_view: last_view)
-    login("dick")
-    get(:show, params: { id: obs.id })
-    assert_equal(2, ObservationView.where(observation: obs).count)
-    assert_operator(obs.last_viewed_by(dick), :>=, 2.seconds.ago)
-    assert_select("p.footer-view-stats") do |p|
-      assert_includes(p.to_s, :footer_viewed.t(date: last_view.web_time,
-                                               times: :one_time.l))
-      assert_includes(p.to_s, :footer_last_you_viewed.t(date: :footer_never.l))
-    end
-
-    last_view = 2.months.ago
-    obs.update!(last_view: last_view)
-    obs.observation_views.where(user: dick).first.update!(last_view: last_view)
-    get(:show, params: { id: obs.id })
-    assert_equal(2, ObservationView.where(observation: obs).count)
-    assert_operator(obs.last_viewed_by(dick), :>=, 2.seconds.ago)
-    assert_select("p.footer-view-stats") do |p|
-      assert_includes(p.to_s, :footer_viewed.t(date: last_view.web_time,
-                                               times: :many_times.l(num: 2)))
-      assert_includes(p.to_s,
-                      :footer_last_you_viewed.t(date: last_view.web_time))
-    end
-  end
-
-  ######## Index ################################################
-  # Tests of index, with tests arranged as follows:
-  # default subaction; then
-  # other subactions in order of @index_subaction_param_keys
-  # miscellaneous tests using get(:index)
-
-  # First, test that the index does not require login - AN 20230923
-  def test_index_no_login
-    # login
-    get(:index)
-
-    assert_template("shared/_matrix_box")
-    assert_displayed_title("Observations by #{:sort_by_rss_log.l}")
-  end
-
-  def test_index_sorted_by_name
-    by = "name"
-
-    login
-    get(:index, params: { by: by })
-
-    assert_displayed_title("Observations by #{by.capitalize}")
-  end
-
-  def test_index_sorted_by_user
-    by = "user"
-
-    login
-    get(:index, params: { by: by })
-
-    assert_displayed_title("Observations by #{by.capitalize}")
-  end
-
-  def test_index_sorted_by_invalid_order
-    by = "edibility"
-
-    login
-
-    exception = assert_raise(RuntimeError) do
-      get(:index, params: { by: by })
-    end
-    assert_equal("Can't figure out how to sort Observations by :#{by}.",
-                 exception.message)
-  end
-
-  def test_index_with_id
-    obs = observations(:agaricus_campestris_obs)
-
-    login
-    get(:index, params: { id: obs.id })
-
-    assert_template("shared/_matrix_box")
-    assert_displayed_title("Observation Index")
-    assert_select(
-      "#results .rss-heading a[href ^= '/#{obs.id}'] .rss-name",
-      { text: obs.format_name.t.strip_html },
-      "Index should open at the page that includes #{obs.format_name}"
-    )
-    assert_select("#results a", { text: "« Prev" },
-                  "Wrong page or display is missing a link to Prev page")
-  end
-
-  # Created in response to a bug seen in the wild
-  # place_name isn't a param for Observation#index
-  # but is an API param and a param for Observation#create
-  def test_index_useless_param
-    params = { place_name: "Burbank" }
-
-    login
-    get(:index, params: params)
-
-    assert_displayed_title("Observations by #{:sort_by_rss_log.l}")
-  end
-
-  def test_index_useless_param_page2
-    params = { place_name: "Burbank", page: 2 }
-
-    login
-    get(:index, params: params)
-
-    assert_displayed_title("Observations by #{:sort_by_rss_log.l}")
-    assert_select("#results a", { text: "« Prev" },
-                  "Wrong page or display is missing a link to Prev page")
-  end
-
-  def test_index_advanced_search_name_and_location_multiple_hits
-    name = "Agaricus"
-    location = "California"
-    expected_hits = Observation.where(Observation[:text_name] =~ name).
-                    where(Observation[:where] =~ location).
-                    count
-
-    login
-    get(:index,
-        params: { name: name, location: location,
-                  advanced_search: "1" })
-
-    assert_response(:success)
-    assert_displayed_title("Advanced Search")
-    assert_select(
-      "#results .rss-what a:match('href', ?)", %r{^/\d},
-      { count: expected_hits },
-      "Wrong number of results"
-    )
-  end
-
-  def test_index_advanced_search_name_one_hit
-    obs = observations(:strobilurus_diminutivus_obs)
-    search_string = obs.text_name
-    query = Query.lookup_and_save(:Observation, :advanced_search,
-                                  name: search_string)
-    assert(query.results.one?,
-           "Test needs a string that has exactly one hit")
-
-    login
-    get(:index,
-        params: @controller.query_params(query).merge(advanced_search: true))
-
-    assert_match(/#{obs.id}/, redirect_to_url,
-                 "Advanced Search with 1 hit should show the hit")
-  end
-
-  def test_index_advanced_search_no_hits
-    query = Query.lookup_and_save(:Observation, :advanced_search,
-                                  name: "Don't know",
-                                  user: "myself",
-                                  content: "Long pink stem and small pink cap",
-                                  location: "Eastern Oklahoma")
-
-    login
-    get(:index,
-        params: @controller.query_params(query).merge({ advanced_search: "1" }))
-
-    assert_select("title", { text: "#{:app_title.l}: Index" },
-                  "Wrong page or metadata <title>")
-    assert_displayed_title("")
-    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
-  end
-
-  def test_index_advanced_search_notes1
-    login
-    get(:index,
-        params: {
-          name: "Fungi",
-          location: "String in notes",
-          # Deliberately omit search_location_notes: 1
-          advanced_search: "1"
-        })
-
-    assert_response(:success)
-    assert_select("title", { text: "#{:app_title.l}: Index" },
-                  "Wrong page or metadata <title>")
-    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
-    assert_select(
-      "#results a", false,
-      "There should be no results when string is missing from notes, " \
-      "and search_location_notes param is missing"
-    )
-  end
-
-  def test_index_advanced_search_notes2
-    login
-    # Include notes, but notes don't have string yet!
-    get(
-      :index,
-      params: {
-        name: "Fungi",
-        location: '"String in notes"',
-        search_location_notes: 1,
-        advanced_search: "1"
-      }
-    )
-
-    assert_response(:success)
-    assert_select("title", { text: "#{:app_title.l}: Index" },
-                  "Wrong page or metadata <title>")
-    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
-    assert_select(
-      "#results a", false,
-      "There should be no results when string is missing from notes, " \
-      "even if search_location_notes param is true"
-    )
-  end
-
-  def test_index_advanced_search_notes3
-    # Add string to notes, make sure it is actually added.
-    login("rolf")
-    loc = locations(:burbank)
-    loc.notes = "blah blah blahString in notesblah blah blah"
-    loc.save
-    loc.reload
-    assert(loc.notes.to_s.include?("String in notes"))
-
-    login
-    # Forget to include notes again.
-    get(:index,
-        params: {
-          name: "Fungi",
-          location: "String in notes",
-          # Deliberately omit search_location_notes: 1
-          advanced_search: "1"
-        })
-
-    assert_response(:success)
-    assert_select("title", { text: "#{:app_title.l}: Index" },
-                  "Wrong page or metadata <title>")
-    assert_flash_text(:runtime_no_matches.l(type: :observations.l))
-    assert_select(
-      "#results a", false,
-      "There should be no results when notes include search string, " \
-      "if search_location_notes param is missing"
-    )
-  end
-
-  def test_index_advanced_search_notes4
-    # Add string to notes, make sure it is actually added.
-    login("rolf")
-    loc = locations(:burbank)
-    loc.notes = "blah blah blahString in notesblah blah blah"
-    loc.save
-    loc.reload
-    assert(loc.notes.to_s.include?("String in notes"))
-
-    login
-    # Now it should finally find the three unknowns at Burbank because Burbank
-    # has the magic string in its notes, and we're looking for it.
-    get(:index,
-        params: {
-          name: "Fungi",
-          location: '"String in notes"',
-          search_location_notes: 1,
-          advanced_search: "1"
-        })
-
-    assert_response(:success)
-    results = @controller.instance_variable_get(:@objects)
-    assert_equal(3, results.length)
-  end
-
-  def test_index_advanced_search_error
-    query = Query.lookup_and_save(:Observation, :advanced_search, name: "Fungi")
-
-    login
-    @controller.stub(:show_selected_observations, -> { raise(RuntimeError) }) do
-      get(:index,
-          params: @controller.query_params(query).merge(
-            { advanced_search: "1" }
-          ))
-    end
-
-    assert_redirected_to(
-      search_advanced_path,
-      "Advanced Search should reload form if it throws an error"
-    )
-  end
-
-  def test_index_pattern_search_help
-    login
-    get(:index, params: { pattern: "help:me" })
-
-    assert_flash_error
-    assert_match(/unexpected term/i, @response.body)
-  end
-
-  def test_index_pattern_multiple_hits
-    pattern = "Agaricus"
-
-    login
-    get(:index, params: { pattern: pattern })
-
-    # Because this pattern is a name, the title will reflect that Query is
-    # assuming this is a search by name with synonyms and subtaxa.
-    assert_displayed_title("Observations of #{pattern}")
-    assert_select(
-      "#results a:match('href', ?)", %r{^/\d+},
-      { text: /#{pattern}/i,
-        count: Observation.where(Observation[:text_name] =~ /#{pattern}/i).
-               count },
-      "Wrong number of results displayed"
-    )
-  end
-
-  def test_index_pattern_needs_naming_with_filter
-    pattern = "Briceland"
-
-    login
-    get(:index, params: { pattern: pattern, needs_naming: true })
-
-    assert_displayed_title("")
-    assert_match(/^#{identify_observations_url}/, redirect_to_url,
-                 "Wrong page. Should redirect to #{:obs_needing_id.l}")
-  end
-
-  def test_index_pattern1
-    pattern = "Boletus edulis"
-
-    login
-    get(:index, params: { pattern: pattern })
-
-    # assert_displayed_title("Observations Matching ‘#{pattern}’")
-    assert_displayed_title(
-      :query_title_of_name.t(types: "Observations", name: pattern)
-    )
-    assert_not_empty(css_select('[id="right_tabs"]').text, "Tabset is empty")
-  end
-
-  def test_index_pattern_page2
-    pattern = "Boletus edulis"
-
-    login
-    get(:index, params: { pattern: pattern, page: 2 })
-
-    # assert_displayed_title("Observations Matching ‘#{pattern}’")
-    assert_displayed_title(
-      :query_title_of_name.t(types: "Observations", name: pattern)
-    )
-    assert_not_empty(css_select('[id="right_tabs"]').text, "Tabset is empty")
-    assert_select("#results a", { text: "« Prev" },
-                  "Wrong page or display is missing a link to Prev page")
-  end
-
-  def test_index_pattern_no_hits
-    pattern = "no hits"
-
-    login
-    get(:index, params: { pattern: pattern })
-
-    assert_empty(css_select('[id="right_tabs"]').text,
-                 "RH tabset should be empty when search has no hits")
-    assert_displayed_title(:title_for_observation_search.l)
-  end
-
-  def test_index_pattern_one_hit
-    obs = observations(:two_img_obs)
-
-    login
-    get(:index, params: { pattern: obs.id })
-
-    assert_match(/#{obs.id}/, redirect_to_url,
-                 "Search with 1 hit should show the hit")
-  end
-
-  def test_index_pattern_bad_pattern
-    pattern = { error: "" }
-
-    login
-    get(:index, params: { pattern: pattern })
-
-    assert_response(:success)
-    assert_flash_error
-    assert_displayed_title("")
-    assert_select("#results", { text: "" }, "There should be no results")
-  end
-
-  def test_index_pattern_bad_pattern_from_needs_naming
-    pattern = { error: "" }
-
-    login
-    get(:index, params: { pattern: pattern, needs_naming: true })
-
-    assert_redirected_to(
-      identify_observations_path,
-      "Bad pattern in search from obs_needing_ids should render " \
-      "obs_needing_ids"
-    )
-  end
-
-  def test_index_look_alikes
-    obs = observations(:owner_only_favorite_ne_consensus)
-    name = obs.name
-    look_alikes = Observation.joins(:namings).
-                  where(namings: { name: name }).
-                  where.not(name: name).count
-    assert(look_alikes > 1, "Test needs different fixture")
-
-    login
-    get(:index, params: { look_alikes: "1", name: name.id })
-
-    assert_displayed_title("Observations of #{name.text_name}")
-    assert_select(
-      "#results a:match('href', ?)", %r{^/\d+},
-      { count: look_alikes },
-      "Wrong number of results displayed"
-    )
-  end
-
-  def test_index_look_alikes_no_hits
-    obs = observations(:strobilurus_diminutivus_obs)
-    name = obs.name
-    look_alikes = Observation.joins(:namings).
-                  where(namings: { name: name }).
-                  where.not(name: name).count
-    assert(look_alikes.zero?, "Test needs different fixture")
-
-    login
-    get(:index, params: { look_alikes: "1", name: name.id })
-
-    assert_response(:success)
-    assert_displayed_title("")
-    assert_select(
-      "#results a:match('href', ?)", %r{^/\d+},
-      { count: look_alikes },
-      "Wrong number of results displayed"
-    )
-  end
-
-  def test_index_related_taxa
-    name = names(:tremella_mesenterica)
-    parent = name.parents.first
-    obss_of_related_taxa =
-      Observation.where(
-        name: Name.where(Name[:text_name] =~ /#{parent.text_name} /).or(
-          Name.where(Name[:classification] =~ /: _#{parent.text_name}_/)
-        ).or(Name.where(id: parent.id))
-      )
-
-    login
-    get(:index, params: { related_taxa: "1", name: name.text_name })
-    assert_displayed_title("Observations of #{parent.text_name}")
-    assert_select(
-      "#results a:match('href', ?)", %r{^/\d+},
-      { count: obss_of_related_taxa.count },
-      "Wrong number of results displayed"
-    )
-  end
-
-  def test_index_name
-    name = names(:fungi)
-    ids = Observation.where(name: name).map(&:id)
-    assert(ids.length.positive?, "Test needs different fixture for 'name'")
-    params = { name: name }
-
-    login("zero") # Has no observations
-    get(:index, params: params)
-
-    assert_response(:success)
-    assert_displayed_title("Observations of #{name.text_name}")
-    ids.each do |id|
-      assert_select(
-        "a:match('href', ?)", %r{^/#{id}}, true,
-        "Observations of Name should link to each Observation of Name"
-      )
-    end
-  end
-
-  def test_index_user_by_known_user
-    # Make sure fixtures are still okay
-    obs = observations(:coprinus_comatus_obs)
-    assert_not_nil(obs.rss_log_id)
-    assert_not_nil(obs.thumb_image_id)
-    user = rolf
-    assert(
-      user.layout_count >= user.observations.size,
-      "User must be able to display all rolf's Observations in a single page"
-    )
-
-    test_show_owner_id_noone_logged_in
-
-    login(user.login)
-    get(:index, params: { user: user.id })
-
-    assert_displayed_title("Observations created by #{user.name}")
-    assert_select(
-      "#results img.image_#{obs.thumb_image_id}",
-      true,
-      "Observation thumbnail should display although this is not an rss_log"
-    )
-    assert_select(
-      "#results a:match('href', ?)", %r{^/\d+},
-      { text: /\S+/, # ignore links in buttons
-        count: Observation.where(user: user).count },
-      "Wrong number of results displayed"
-    )
-  end
-
-  def test_index_user_unknown_user
-    user = observations(:minimal_unknown_obs)
-
-    login
-    get(:index, params: { user: user })
-
-    assert_equal(users_url, redirect_to_url, "Wrong page")
-    assert_flash_text(:runtime_object_not_found.l(type: :user.l, id: user.id))
-  end
-
-  def test_index_location_with_observations
-    location = locations(:obs_default_location)
-    params = { location: location.id }
-
-    login
-    get(:index, params: params)
-
-    assert_displayed_title("Observations from #{location.title_display_name}")
-  end
-
-  def test_index_location_without_observations
-    location = locations(:unused_location)
-    params = { location: location }
-    flash_matcher = Regexp.new(
-      Regexp.escape_except_spaces(
-        :runtime_no_matches.t(type: :observation)
-      )
-    )
-
-    login
-    get(:index, params: params)
-
-    assert_response(:success)
-    assert_flash(flash_matcher)
-    assert_displayed_title("")
-  end
-
-  def test_index_location_with_nonexistent_location
-    location = "non-existent"
-    params = { location: location }
-    flash_matcher = Regexp.new(
-      Regexp.escape_except_spaces(
-        :runtime_object_not_found.t(type: :location, id: location)
-      )
-    )
-
-    login
-    get(:index, params: params)
-
-    assert_flash(flash_matcher)
-    assert_redirected_to(locations_path)
-  end
-
-  def test_index_where
-    location = locations(:obs_default_location)
-
-    login
-    get(:index, params: { where: location.name })
-
-    assert_displayed_title("Observations from ‘#{location.name}’")
-  end
-
-  def test_index_where_page2
-    location = locations(:obs_default_location)
-
-    login
-    get(:index, params: { where: location.name, page: 2 })
-
-    assert_displayed_title("Observations from ‘#{location.name}’")
-    assert_not_empty(css_select('[id="right_tabs"]').text, "Tabset is empty")
-    assert_select("#results a", { text: "« Prev" },
-                  "Wrong page or display is missing a link to Prev page")
-  end
-
-  def test_index_project
-    project = projects(:bolete_project)
-
-    login
-    get(:index, params: { project: project.id })
-
-    assert_response(:success)
-    assert_displayed_title("Observations for #{project.title}")
-  end
-
-  def test_index_project_without_observations
-    project = projects(:empty_project)
-
-    login
-    get(:index, params: { project: project.id })
-
-    assert_response(:success)
-    assert_displayed_title("")
-  end
-
-  # Prove that lichen content_filter works on observations
-  def test_index_with_lichen_filter_only_lichens
-    user = users(:lichenologist)
-
-    login(user.name)
-    get(:index)
-
-    results = @controller.instance_variable_get(:@objects)
-
-    assert(results.many?)
-    assert(results.all? { |result| result.lifeform.include?("lichen") },
-           "All results should be lichen-ish")
-  end
-
-  def test_index_with_lichen_filter_hide_lichens
-    user = users(:antilichenologist)
-
-    login(user.name)
-    get(:index)
-
-    results = @controller.instance_variable_get(:@objects)
-
-    assert(results.many?)
-    assert(results.none? { |result| result.lifeform.include?(" lichen ") },
-           "No results should be lichens")
-  end
-
-  def test_index_with_region_filter
-    observations_in_region = Observation.where(
-      Observation[:where].matches("%California, USA")
-    ).order(:id).to_a
-
-    user = users(:californian)
-    # Make sure the fixture is still okay
-    assert_equal({ region: "California, USA" }, user.content_filter)
-    assert(user.layout_count >= observations_in_region.size,
-           "User must be able to display search results in a single page.")
-
-    login(user.name)
-    get(:index)
-
-    results = @controller.instance_variable_get(:@objects).sort_by(&:id)
-    assert_obj_arrays_equal(observations_in_region, results)
-  end
-
-  ##############################################################################
-
-  # ------ Show ----------------------------------------------- #
-
-  def test_show_observation_num_views
-    login
-    obs = observations(:coprinus_comatus_obs)
-    updated_at = obs.updated_at
-    num_views = obs.num_views
-    last_view = obs.last_view
-    # obs.update_view_stats
-    get(:show, params: { id: obs.id })
-    obs.reload
-    assert_equal(num_views + 1, obs.num_views)
-    assert_not_equal(last_view, obs.last_view)
-    assert_equal(updated_at, obs.updated_at)
-  end
-
-  def assert_show_observation
-    assert_template("observations/show")
-    assert_template("observations/show/_name_info")
-    assert_template("observations/show/_observation_details")
-    # assert_template("observations/show/_namings") now a helper
-    assert_template("comments/_comments_for_object")
-    assert_template("observations/show/_thumbnail_map")
-  end
-
-  def test_show_observation
-    login
-    assert_equal(0, QueryRecord.count)
-
-    # Test it on obs with no namings first.
-    obs = observations(:unknown_with_no_naming)
-    get(:show, params: { id: obs.id })
-    assert_show_observation
-
-    # You must be logged in to get the show_obs naming table now.
-    # Test it on obs with two namings (Rolf's and Mary's), with owner logged in.
-    obs = observations(:coprinus_comatus_obs)
-    rolf_nmg = obs.namings.first
-    consensus = Observation::NamingConsensus.new(obs)
-    get(:show, params: { id: obs.id })
-    assert_show_observation
-    assert_form_action(controller: "observations/namings/votes",
-                       action: :update, naming_id: rolf_nmg.id,
-                       observation_id: obs.id,
-                       id: consensus.users_vote(rolf_nmg, rolf))
-
-    # Test it on obs with two namings, with non-owner logged in.
-    login("mary")
-    obs = observations(:coprinus_comatus_obs)
-    get(:show, params: { id: obs.id })
-    assert_show_observation
-    assert_form_action(controller: "observations/namings/votes",
-                       action: :update, naming_id: rolf_nmg.id,
-                       observation_id: obs.id,
-                       id: consensus.users_vote(rolf_nmg, mary))
-
-    # Test a naming owned by the observer but the observer has 'No Opinion'.
-    # Ensure that rolf owns @obs_with_no_opinion.
-    user = login("rolf")
-    obs = observations(:strobilurus_diminutivus_obs)
-    assert_equal(obs.user, user)
-    get(:show, params: { id: obs.id })
-    assert_show_observation
-
-    # Make sure no queries created for show_image links.
-    assert_empty(QueryRecord.where("description like '%model=:Image%'"))
-  end
-
-  def test_show_observation_change_vote_anonymity
-    obs = observations(:coprinus_comatus_obs)
-    user = login(users(:public_voter).name)
-
-    get(:show, params: { id: obs.id, go_private: 1 })
-    user.reload
-    assert_equal("yes", user.votes_anonymous)
-
-    get(:show, params: { id: obs.id, go_public: 1 })
-    user.reload
-    assert_equal("no", user.votes_anonymous)
-  end
-
-  def test_show_owner_naming
-    login(user_with_view_owner_id_true)
-    obs = observations(:owner_only_favorite_ne_consensus)
-    consensus = Observation::NamingConsensus.new(obs)
-
-    get(:show, params: { id: obs.id })
-    assert_select("#owner_naming",
-                  { text: /#{consensus.owner_preference.text_name}/,
-                    count: 1 },
-                  "Observation should show owner's preferred naming")
-
-    get(
-      :show, params: { id: observations(:owner_multiple_favorites).id }
-    )
-    assert_select("#owner_naming",
-                  { text: /#{:show_observation_no_clear_preference.t}/,
-                    count: 1 },
-                  "Observation should show lack of owner naming preference")
-  end
-
-  def test_show_owner_naming_view_owner_id_false
-    login(user_with_view_owner_id_false)
-    get(
-      :show, params: { id: observations(:owner_only_favorite_ne_consensus).id }
-    )
-    assert_select(
-      "#owner_naming", { count: 0 },
-      "Do not show owner's preferred naming when user has not opted for it"
-    )
-  end
-
-  def test_show_owner_id_noone_logged_in
-    logout
-    get(
-      :show, params: { id: observations(:owner_only_favorite_ne_consensus).id }
-    )
-    assert_select("#owner_naming", { count: 0 },
-                  "Do not show Observer ID when nobody logged in")
-  end
-
-  def user_with_view_owner_id_true
-    users(:rolf).login
-  end
-
-  def user_with_view_owner_id_false
-    users(:dick).login
-  end
-
-  def test_observation_external_links_exist
-    login
-    obs_id = observations(:coprinus_comatus_obs).id
-    get(:show, params: { id: obs_id })
-
-    assert_select("a[href *= 'images.google.com']")
-    assert_select("a[href *= 'mycoportal.org']")
-
-    # There is a MycoBank link which includes taxon name and MycoBank language
-    assert_select("a[href *= 'mycobank.org']") do
-      assert_select("a[href *= '/Coprinus%20comatus']")
-    end
-  end
-
-  def test_show_observation_edit_links
-    obs = observations(:detailed_unknown_obs)
-    proj = projects(:bolete_project)
-    assert_equal(mary.id, obs.user_id)  # owned by mary
-    assert(obs.projects.include?(proj)) # owned by bolete project
-
-    login("rolf") # Can't edit
-    get(:show, params: { id: obs.id })
-    assert_select("a:match('href',?)", edit_observation_path(obs.id), count: 0)
-    assert_select(".destroy_observation_link_#{obs.id}", count: 0)
-    assert_select("a:match('href',?)",
-                  new_image_for_observation_path(obs.id), count: 0)
-    assert_select("a:match('href',?)",
-                  remove_images_from_observation_path(obs.id), count: 0)
-    assert_select("a:match('href',?)",
-                  reuse_images_for_observation_path(obs.id), count: 0)
-    get(:edit, params: { id: obs.id })
-    assert_response(:redirect)
-    get(:destroy, params: { id: obs.id })
-    assert_flash_error
-
-    login("mary") # Owner
-    get(:show, params: { id: obs.id })
-    assert_select("a[href=?]", edit_observation_path(obs.id), minimum: 1)
-    # Destroy button is in a form, not a link_to
-    assert_select(".destroy_observation_link_#{obs.id}", minimum: 1)
-    assert_select("a[href=?]",
-                  new_image_for_observation_path(obs.id), minimum: 1)
-    assert_select("a[href=?]",
-                  remove_images_from_observation_path(obs.id), minimum: 1)
-    assert_select("a[href=?]",
-                  reuse_images_for_observation_path(obs.id), minimum: 1)
-    get(:edit, params: { id: obs.id })
-    assert_response(:success)
-
-    login("dick") # Project permission
-    get(:show, params: { id: obs.id })
-    assert_select("a[href=?]", edit_observation_path(obs.id), minimum: 1)
-    # Destroy button is in a form, not a link_to
-    assert_select(".destroy_observation_link_#{obs.id}", minimum: 1)
-    assert_select("a[href=?]",
-                  new_image_for_observation_path(obs.id), minimum: 1)
-    assert_select("a[href=?]",
-                  remove_images_from_observation_path(obs.id), minimum: 1)
-    assert_select("a[href=?]",
-                  reuse_images_for_observation_path(obs.id), minimum: 1)
-    get(:edit, params: { id: obs.id })
-    assert_response(:success)
-    get(:destroy, params: { id: obs.id })
-    assert_flash_success
-  end
-
-  def test_show_observation_specimen_stuff
-    obs1 = observations(:strobilurus_diminutivus_obs)
-    obs2 = observations(:minimal_unknown_obs)
-    obs3 = observations(:detailed_unknown_obs)
-    observations(:locally_sequenced_obs).sequences.
-      first.update(observation: obs2)
-    observations(:genbanked_obs).sequences.
-      each { |s| s.update(observation: obs3) }
-    obs2.reload
-    obs3.reload
-
-    # Obs1 has nothing, owned by rolf, not in project.
-    assert_users_equal(rolf, obs1.user)
-    assert_empty(obs1.projects)
-    assert_empty(obs1.collection_numbers)
-    assert_empty(obs1.herbarium_records)
-    assert_empty(obs1.sequences)
-
-    # Obs2 owned by mary, not in project,
-    # one collection_number owned by mary,
-    # one herbarium_record owned by rolf at NY (roy is curator),
-    # one sequence owned by rolf.
-    assert_users_equal(mary, obs2.user)
-    assert_empty(obs2.projects)
-    assert_operator(obs2.collection_numbers.count, :==, 1)
-    assert_operator(obs2.herbarium_records.count, :==, 1)
-    assert_operator(obs2.sequences.count, :==, 1)
-    assert_false(obs2.herbarium_records.first.can_edit?(mary))
-    assert_true(obs2.herbarium_records.first.can_edit?(rolf))
-    assert_true(obs2.herbarium_records.first.can_edit?(roy))
-
-    # Obs3 owned by mary, in bolete project (dick admin and member),
-    # two collection_numbers owned by mary,
-    # two herbarium_records, one owned by rolf at NY,
-    #   one owned by mary at FunDiS,
-    # several sequences all owned by dick.
-    assert_users_equal(mary, obs3.user)
-    assert_equal("Bolete Project", obs3.projects.first.title)
-    assert_true(obs3.can_edit?(dick))
-    assert_operator(obs3.collection_numbers.count, :>, 1)
-    assert_operator(obs3.herbarium_records.count, :>, 1)
-    assert_operator(obs3.sequences.count, :>, 1)
-
-    # Katrina isn't associated in any way with any of these observations.
-    login("katrina")
-    get(:show, params: { id: obs1.id })
-    assert_show_obs(:collection_numbers, obs1.id, [], false)
-    assert_show_obs(:herbarium_records, obs1.id, [], false)
-    # But any logged-in user can add sequence to any observation.
-    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
-                  "Observation page should show an Add Sequence link for " \
-                  "any logged-in user")
-
-    get(:show, params: { id: obs2.id })
-    assert_show_obs(:collection_numbers, obs2.id,
-                    [[obs2.collection_numbers.first.id, false]],
-                    false)
-    assert_show_obs(:herbarium_records, obs2.id,
-                    [[obs2.herbarium_records.first.id, false]],
-                    false)
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs3.id })
-    assert_show_obs(:collection_numbers, obs3.id,
-                    obs3.collection_numbers.map { |x| [x.id, false] },
-                    false)
-    assert_show_obs(:herbarium_records, obs3.id,
-                    obs3.herbarium_records.map { |x| [x.id, false] },
-                    false)
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    # Roy is a curator at NY, so can add herbarium records, and modify existing
-    # herbarium records attached to NY.
-    login("roy")
-    assert_true(roy.curated_herbaria.any?)
-    get(:show, params: { id: obs1.id })
-    assert_show_obs(:collection_numbers, obs1.id, [], false)
-    assert_show_obs(:herbarium_records, obs1.id, [], true)
-    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
-                  "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs2.id })
-    assert_show_obs(:collection_numbers, obs2.id,
-                    [[obs2.collection_numbers.first.id, false]],
-                    false)
-    assert_show_obs(:herbarium_records, obs2.id,
-                    [[obs2.herbarium_records.first.id, true]],
-                    true)
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs3.id })
-    assert_show_obs(:collection_numbers, obs3.id,
-                    obs3.collection_numbers.map { |x| [x.id, false] },
-                    false)
-    assert_show_obs(:herbarium_records, obs3.id,
-                    obs3.herbarium_records.map { |x| [x.id, x.can_edit?(roy)] },
-                    true)
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    # Dick owns all of the sequences, is on obs3's project, and has a personal
-    # herbarium.
-    login("dick")
-    get(:show, params: { id: obs1.id })
-    assert_show_obs(:collection_numbers, obs1.id, [], false)
-    assert_show_obs(:herbarium_records, obs1.id, [], true)
-    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
-                  "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs2.id })
-    assert_show_obs(:collection_numbers, obs2.id,
-                    [[obs2.collection_numbers.first.id, false]],
-                    false)
-    assert_show_obs(:herbarium_records, obs2.id,
-                    [[obs2.herbarium_records.first.id, false]],
-                    true)
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs3.id })
-    assert_show_obs(:collection_numbers, obs3.id,
-                    obs3.collection_numbers.map { |x| [x.id, true] },
-                    true)
-    assert_show_obs(:herbarium_records, obs3.id,
-                    obs3.herbarium_records.map { |x| [x.id, false] },
-                    true)
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
-                  { count: 1 },
-                  "Observation page missing an Add Sequence link")
-
-    # Rolf owns obs1 and owns one herbarium record for both obs2 and obs3,
-    # and he is a curator at NYBG.
-    login("rolf")
-    get(:show, params: { id: obs1.id })
-    assert_show_obs(:collection_numbers, obs1.id, [], true)
-    assert_show_obs(:herbarium_records, obs1.id, [], true)
-    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
-                  "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs2.id })
-    assert_show_obs(:collection_numbers, obs2.id,
-                    [[obs2.collection_numbers.first.id, false]],
-                    false)
-    assert_show_obs(:herbarium_records, obs2.id,
-                    [[obs2.herbarium_records.first.id, true]],
-                    true)
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs3.id })
-    assert_show_obs(:collection_numbers, obs3.id,
-                    obs3.collection_numbers.map { |x| [x.id, false] }, false)
-    assert_show_obs(
-      :herbarium_records, obs3.id,
-      obs3.herbarium_records.map { |x| [x.id, x.can_edit?(rolf)] },
-      true
-    )
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
-                  { count: 1 },
-                  "Observation page missing an Add Sequence link")
-
-    # Mary owns obs2 and obs3, but has nothing to do with obs1.
-    login("mary")
-    get(:show, params: { id: obs1.id })
-    assert_show_obs(:collection_numbers, obs1.id, [], false)
-    assert_show_obs(:herbarium_records, obs1.id, [], false)
-    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
-                  "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs2.id })
-    assert_show_obs(
-      :collection_numbers, obs2.id,
-      [[obs2.collection_numbers.first.id, true]],
-      true
-    )
-    assert_show_obs(
-      :herbarium_records, obs2.id,
-      [[obs2.herbarium_records.first.id, false]],
-      true
-    )
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs3.id })
-    assert_show_obs(
-      :collection_numbers, obs3.id,
-      obs3.collection_numbers.map { |x| [x.id, true] },
-      true
-    )
-    assert_show_obs(
-      :herbarium_records, obs3.id,
-      obs3.herbarium_records.map { |x| [x.id, x.can_edit?(mary)] },
-      true
-    )
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    # Make sure admins can do everything.
-    make_admin("katrina")
-    get(:show, params: { id: obs1.id })
-    assert_show_obs(:collection_numbers, obs1.id, [], true)
-    assert_show_obs(:herbarium_records, obs1.id, [], true)
-    assert_select("a[href ^= '#{new_sequence_path}']", { count: 1 },
-                  "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs2.id })
-    assert_show_obs(
-      :collection_numbers, obs2.id,
-      [[obs2.collection_numbers.first.id, true]],
-      true
-    )
-    assert_show_obs(
-      :herbarium_records, obs2.id,
-      [[obs2.herbarium_records.first.id, true]],
-      true
-    )
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs2.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-
-    get(:show, params: { id: obs3.id })
-    assert_show_obs(
-      :collection_numbers, obs3.id,
-      obs3.collection_numbers.map { |x| [x.id, true] },
-      true
-    )
-    assert_show_obs(
-      :herbarium_records, obs3.id,
-      obs3.herbarium_records.map { |x| [x.id, true] },
-      true
-    )
-    assert_select("a[href ^= '#{new_sequence_path(observation_id: obs3.id)}']",
-                  { count: 1 }, "Observation page missing an Add Sequence link")
-  end
-
-  def test_show_observation_original_link_absent
-    obs = observations(:coprinus_comatus_obs)
-    assert_blank(obs.inat_id, "Test needs fixture without iNat id")
-
-    login
-    get(:show, params: { id: obs.id })
-
-    assert_select(
-      "#inat_id a:match('href',?)",
-      %r{https://inaturalist.org/observations/\d+},
-      false,
-      "Obs should not link to an iNat observation"
-    )
-  end
-
-  def test_show_observation_original_link_present
-    obs = observations(:imported_inat_obs)
-    assert(obs.inat_id.present?, "Test needs fixture with an iNat id")
-
-    login
-    get(:show, params: { id: obs.id })
-
-    assert_select(
-      "#inat_id a:match('href', ?)",
-      "https://inaturalist.org/observations/#{obs.inat_id}",
-      true,
-      "Obs should link to iNat original"
-    )
-  end
-
-  # Refactored for CRUD routes in :collection_numbers or :herbarium_records
-  def assert_show_obs(types, _id, items, can_add)
-    type = types.to_s.chop
-    selector = types == :collection_numbers && !can_add ? "i" : "li"
-    assert_select("#observation_#{types} #{selector}",
-                  items.count,
-                  "Wrong number of #{types} shown.")
-    if can_add
-      assert(response.body.match(%r{href="/#{types}/new}),
-             "Expected to find a create link for #{types}.")
-    else
-      assert_not(response.body.match(%r{href="/#{types}/new}),
-                 "Expected not to find a create link for #{types}.")
-    end
-
-    items.each do |type_id, can_edit|
-      if can_edit
-        assert(response.body.match(%r{href="/#{types}/#{type_id}/edit}),
-               "Expected to find an edit link for #{type} #{type_id}.")
-      else
-        assert_not(
-          response.body.match(%r{href="/#{types}/#{type_id}/edit}),
-          "Expected not to find an edit link for #{type} #{type_id}."
-        )
-      end
-    end
-  end
-
-  def test_prev_and_next_observation_simple
-    # Uses non-default observation query. :when is the default order
-    o_chron = Observation.order(created_at: :desc, id: :desc)
-    login
-    # need to save a query here to get :next in a non-standard order
-    Query.lookup_and_save(:Observation, :all, by: :created_at)
-    qr = QueryRecord.last.id.alphabetize
-
-    get(:show, params: { id: o_chron.fourth.id, flow: :next, q: qr })
-    assert_redirected_to(action: :show, id: o_chron.fifth.id, q: qr)
-
-    get(:show, params: { id: o_chron.fourth.id, flow: :prev, q: qr })
-    assert_redirected_to(action: :show, id: o_chron.third.id, q: qr)
-  end
-
-  def test_prev_and_next_observation_with_fancy_query
-    n1 = names(:agaricus_campestras)
-    n2 = names(:agaricus_campestris)
-    n3 = names(:agaricus_campestros)
-    n4 = names(:agaricus_campestrus)
-
-    n2.transfer_synonym(n1)
-    n2.transfer_synonym(n3)
-    n2.transfer_synonym(n4)
-    n1.correct_spelling = n2
-    n1.save_without_our_callbacks
-
-    o1 = n1.observations.first
-    o2 = n2.observations.first
-    o3 = n3.observations.first
-    o4 = n4.observations.first
-
-    # When requesting non-synonym observations of n2, it should include n1,
-    # since an observation of n1 was clearly intended to be an observation of
-    # n2.
-    query = Query.lookup_and_save(:Observation, :all,
-                                  names: n2.id,
-                                  include_synonyms: false,
-                                  by: :name)
-    assert_equal(2, query.num_results)
-
-    # Likewise, when requesting *synonym* observations, neither n1 nor n2
-    # should be included.
-    query = Query.lookup_and_save(:Observation, :all,
-                                  names: n2.id,
-                                  include_synonyms: true,
-                                  exclude_original_names: true,
-                                  by: :name)
-    assert_equal(2, query.num_results)
-
-    # But for our prev/next test, lets do the all-inclusive query.
-    query = Query.lookup_and_save(:Observation, :all,
-                                  names: n2.id,
-                                  include_synonyms: true,
-                                  by: :name)
-    assert_equal(4, query.num_results)
-    qp = @controller.query_params(query)
-
-    o_id = observations(:minimal_unknown_obs).id
-
-    login
-    get(:show, params: qp.merge({ id: o_id, flow: "next" }))
-    assert_redirected_to(action: :show, id: o_id, params: qp)
-    assert_flash_text(/can.*t find.*results.*index/i)
-    get(:show, params: qp.merge({ id: o1.id, flow: "next" }))
-    assert_redirected_to(action: :show, id: o2.id, params: qp)
-    get(:show, params: qp.merge({ id: o2.id, flow: "next" }))
-    assert_redirected_to(action: :show, id: o3.id, params: qp)
-    get(:show, params: qp.merge({ id: o3.id, flow: "next" }))
-    assert_redirected_to(action: :show, id: o4.id, params: qp)
-    get(:show, params: qp.merge({ id: o4.id, flow: "next" }))
-    assert_redirected_to(action: :show, id: o4.id, params: qp)
-    assert_flash_text(/no more/i)
-
-    get(:show, params: qp.merge({ id: o4.id, flow: "prev" }))
-    assert_redirected_to(action: :show, id: o3.id, params: qp)
-    get(:show, params: qp.merge({ id: o3.id, flow: "prev" }))
-    assert_redirected_to(action: :show, id: o2.id, params: qp)
-    get(:show, params: qp.merge({ id: o2.id, flow: "prev" }))
-    assert_redirected_to(action: :show, id: o1.id, params: qp)
-    get(:show, params: qp.merge({ id: o1.id, flow: "prev" }))
-    assert_redirected_to(action: :show, id: o1.id, params: qp)
-    assert_flash_text(/no more/i)
-    get(:show, params: qp.merge({ id: o_id, flow: "prev" }))
-    assert_redirected_to(action: :show, id: o_id, params: qp)
-    assert_flash_text(/can.*t find.*results.*index/i)
-  end
-
-  ##############################################################################
-
-  # -------------------- Destroy ---------------------------------------- #
-
-  def test_destroy_observation
-    assert(obs = observations(:minimal_unknown_obs))
-    id = obs.id
-    params = { id: id }
-    assert_equal("mary", obs.user.login)
-    requires_user(:destroy,
-                  [{ action: :show }],
-                  params, "mary")
-    assert_redirected_to(action: :index)
-    assert_raises(ActiveRecord::RecordNotFound) do
-      obs = Observation.find(id)
-    end
-  end
-
-  def test_original_filename_visibility
-    login("mary")
-    obs_id = observations(:agaricus_campestris_obs).id
-
-    rolf.keep_filenames = "toss"
-    rolf.save
-    get(:show, params: { id: obs_id })
-    assert_false(@response.body.include?("áč€εиts"))
-
-    rolf.keep_filenames = "keep_but_hide"
-    rolf.save
-    get(:show, params: { id: obs_id })
-    assert_false(@response.body.include?("áč€εиts"))
-
-    rolf.keep_filenames = "keep_and_show"
-    rolf.save
-    get(:show, params: { id: obs_id })
-    assert_true(@response.body.include?("áč€εиts"))
-
-    login("rolf") # owner
-
-    rolf.keep_filenames = "toss"
-    rolf.save
-    get(:show, params: { id: obs_id })
-    assert_true(@response.body.include?("áč€εиts"))
-
-    rolf.keep_filenames = "keep_but_hide"
-    rolf.save
-    get(:show, params: { id: obs_id })
-    assert_true(@response.body.include?("áč€εиts"))
-
-    rolf.keep_filenames = "keep_and_show"
-    rolf.save
-    get(:show, params: { id: obs_id })
-    assert_true(@response.body.include?("áč€εиts"))
-  end
-
-  ##############################################################################
-
-  # ------------------------------
-  #  Test creating observations.
-  # ------------------------------
-
-  # Test "new" observation form.
-  def test_observation_form_links
-    requires_login(:new)
-
-    assert_form_action(action: :create, approved_name: "")
-    assert_link_in_html(:import_observation_from_inat.l,
-                        new_observations_inat_import_path)
-  end
-
-  def test_create_new_observation
-    requires_login(:new)
-    assert_form_action(action: :create, approved_name: "")
-    assert_input_value(:collection_number_name,
-                       users(:rolf).legal_name)
-    assert_input_value(:collection_number_number, "")
-    assert_input_value(:herbarium_record_herbarium_name,
-                       users(:rolf).preferred_herbarium_name)
-    assert_input_value(:herbarium_record_accession_number, "")
-    assert_true(@response.body.include?("Albion, Mendocino Co., California"))
-    users(:rolf).update(location_format: "scientific")
-    get(:new)
-    assert_true(@response.body.include?("California, Mendocino Co., Albion"))
-  end
-
-  def test_create_log_updated_at
-    params = {
-      naming: { name: "", vote: { value: "" } },
-      user: rolf,
-      where: locations.first.name
-    }
-
-    users(:rolf).login
-    post_requires_login(:create, params)
-
-    assert(Observation.last.log_updated_at.is_a?(Time),
-           "Observation should have log_updated_at time")
-  end
-
-  def test_create_observation_without_scientific_name
-    params = { user: rolf,
-               where: locations.first.name }
-    fungi = names(:fungi)
-
-    post_requires_login(:create, params)
-
-    assert_flash_success(
-      "Omitting Scientific Name should not cause flash error or warning."
-    )
-    assert_equal(
-      fungi, Observation.last.name,
-      "Observation should be id'd as `Fungi` if user omits Scientific Name."
-    )
-  end
-
-  def test_create_observation_with_unrecognized_name
-    text_name = "Elfin saddle"
-    params = { naming: { name: text_name },
-               user: rolf,
-               where: locations.first.name }
-    post_requires_login(:create, params)
-
-    assert_select("div[id='name_messages']",
-                  /MO does not recognize the name.*#{text_name}/)
-  end
-
-  def test_construct_observation_approved_place_name
-    where = "Albion, California, USA"
-    generic_construct_observation(
-      { observation: { place_name: where },
-        naming: { name: "Coprinus comatus" },
-        approved_place_name: "" },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert_equal(where, obs.place_name)
-    assert_equal("mo_website", obs.source)
-  end
-
-  def test_create_observation_with_field_slip
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        field_code: field_slips(:field_slip_no_obs).code,
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert(obs.field_slips.count == 1)
-  end
-
-  def test_create_observation_with_collection_number
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        collection_number: { name: "Billy Bob", number: "17-034" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert(obs.collection_numbers.count == 1)
-  end
-
-  def test_create_observation_with_used_collection_number
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        collection_number: { name: "Rolf Singer", number: "1" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert(obs.collection_numbers.count == 1)
-    assert_flash_warning
-  end
-
-  def test_create_observation_with_specimen_and_collector_but_no_number
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        collection_number: { name: "Rolf Singer", number: "" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert_empty(obs.collection_numbers)
-  end
-
-  def test_create_observation_with_collection_number_but_no_specimen
-    generic_construct_observation(
-      { collection_number: { name: "Rolf Singer", number: "3141" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert_not(obs.specimen)
-    assert_empty(obs.collection_numbers)
-  end
-
-  def test_create_observation_with_collection_number_but_no_collector
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        collection_number: { name: "", number: "27-18A.2" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert(obs.collection_numbers.count == 1)
-    col_num = obs.collection_numbers.first
-    assert_equal(rolf.legal_name, col_num.name)
-    assert_equal("27-18A.2", col_num.number)
-  end
-
-  def test_create_observation_with_herbarium_record
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        herbarium_record: {
-          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
-          accession_number: "1234"
-        },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert(obs.herbarium_records.count == 1)
-  end
-
-  def test_create_observation_with_herbarium_duplicate_label
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        herbarium_record: {
-          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
-          accession_number: "1234"
-        },
-        naming: { name: "Cortinarius sp." } },
-      0, 0, 0
-    )
-    assert_input_value(:herbarium_record_herbarium_name,
-                       "NY - The New York Botanical Garden")
-    assert_input_value(:herbarium_record_accession_number, "1234")
-  end
-
-  def test_create_observation_with_herbarium_no_id
-    name = "Coprinus comatus"
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        herbarium_record: {
-          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
-          accession_number: ""
-        },
-        naming: { name: name } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert_true(obs.specimen)
-    assert_equal(0, obs.herbarium_records.count)
-  end
-
-  def test_create_observation_with_herbarium_but_no_specimen
-    generic_construct_observation(
-      { herbarium_record: {
-          herbarium_name: herbaria(:nybg_herbarium).auto_complete_name,
-          accession_number: "1234"
-        },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert_not(obs.specimen)
-    assert(obs.herbarium_records.count.zero?)
-  end
-
-  def test_create_observation_with_new_nonpersonal_herbarium
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        herbarium_record: { herbarium_name: "A Brand New Herbarium",
-                            accession_number: "" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert_empty(obs.herbarium_records)
-  end
-
-  def test_create_observation_with_new_personal_herbarium
-    generic_construct_observation(
-      { observation: { specimen: "1" },
-        herbarium_record: { herbarium_name: katrina.personal_herbarium_name,
-                            accession_number: "12345" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0, katrina
-    )
-    obs = assigns(:observation)
-    assert(obs.specimen)
-    assert_equal(1, obs.herbarium_records.count)
-    assert_not_empty(obs.herbarium_records)
-    herbarium_record = obs.herbarium_records.first
-    herbarium = herbarium_record.herbarium
-    assert(herbarium.curator?(katrina))
-    assert(herbarium.name.include?("Katrina"))
-  end
-
-  def test_create_simple_observation_with_approved_unique_name
-    where = "Simple, Massachusetts, USA"
-    generic_construct_observation(
-      { observation: { place_name: where, thumb_image_id: "0" },
-        naming: { name: "Coprinus comatus" } },
-      1, 1, 0
-    )
-    obs = assigns(:observation)
-    nam = assigns(:naming)
-    assert_equal(where, obs.where)
-    assert_equal(names(:coprinus_comatus).id, nam.name_id)
-    assert_equal("2.03659",
-                 format("%<vote_cache>.5f", vote_cache: obs.vote_cache))
-    assert_not_nil(obs.rss_log)
-    # This was getting set to zero instead of nil if no images were uploaded
-    # when obs was created.
-    assert_nil(obs.thumb_image_id)
-  end
-
-  def test_create_simple_observation_of_unknown_taxon
-    where = "Unknown, Massachusetts, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-    obs = assigns(:observation)
-    assert_equal(where, obs.where) # Make sure it's the right observation
-    assert_not_nil(obs.rss_log)
-  end
-
-  def test_create_observation_with_new_name
-    generic_construct_observation({
-                                    naming: { name: "New name" }
-                                  }, 0, 0, 0)
-  end
-
-  def test_create_observation_with_approved_new_name
-    # Test an observation creation with an approved new name
-    generic_construct_observation({
-                                    naming: { name: "Argus arg-arg" },
-                                    approved_name: "Argus arg-arg"
-                                  }, 1, 1, 2)
-  end
-
-  def test_create_observation_with_approved_name_and_extra_space
-    generic_construct_observation(
-      { naming: { name: "Another new-name  " },
-        approved_name: "Another new-name  " },
-      1, 1, 2
-    )
-  end
-
-  def test_create_observation_with_approved_section
-    # (This is now supported nominally)
-    # (Use Macrocybe because it already exists and has an author.
-    # That way we know it is actually creating a name for this section.)
-    generic_construct_observation(
-      { naming: { name: "Macrocybe section Fakesection" },
-        approved_name: "Macrocybe section Fakesection" },
-      1, 1, 1
-    )
-  end
-
-  def test_create_observation_with_approved_junk_name
-    generic_construct_observation({
-                                    naming: {
-                                      name: "This is a bunch of junk"
-                                    },
-                                    approved_name: "This is a bunch of junk"
-                                  }, 0, 0, 0)
-  end
-
-  def test_create_observation_with_multiple_name_matches
-    generic_construct_observation({
-                                    naming: { name: "Amanita baccata" }
-                                  }, 0, 0, 0)
-  end
-
-  def test_create_observation_choosing_one_of_multiple_name_matches
-    generic_construct_observation(
-      { naming: { name: "Amanita baccata" },
-        chosen_name: { name_id: names(:amanita_baccata_arora).id } },
-      1, 1, 0
-    )
-  end
-
-  def test_create_observation_choosing_deprecated_one_of_multiple_name_matches
-    generic_construct_observation(
-      { naming: { name: names(:pluteus_petasatus_deprecated).text_name } },
-      1, 1, 0
-    )
-    nam = assigns(:naming)
-    assert_equal(names(:pluteus_petasatus_approved).id, nam.name_id)
-  end
-
-  def test_create_observation_with_deprecated_name
-    generic_construct_observation({
-                                    naming: { name: "Lactarius subalpinus" }
-                                  }, 0, 0, 0)
-  end
-
-  def test_create_observation_with_chosen_approved_synonym_of_deprecated_name
-    generic_construct_observation(
-      { naming: { name: "Lactarius subalpinus" },
-        approved_name: "Lactarius subalpinus",
-        chosen_name: { name_id: names(:lactarius_alpinus).id } },
-      1, 1, 0
-    )
-    nam = assigns(:naming)
-    assert_equal(nam.name, names(:lactarius_alpinus))
-  end
-
-  def test_create_observation_with_approved_deprecated_name
-    generic_construct_observation(
-      { naming: { name: "Lactarius subalpinus" },
-        approved_name: "Lactarius subalpinus",
-        chosen_name: {} },
-      1, 1, 0
-    )
-    nam = assigns(:naming)
-    assert_equal(nam.name, names(:lactarius_subalpinus))
-  end
-
-  def test_create_observation_with_approved_new_species
-    # Test an observation creation with an approved new name
-    Name.find_by(text_name: "Agaricus").destroy
-    generic_construct_observation({
-                                    naming: { name: "Agaricus novus" },
-                                    approved_name: "Agaricus novus"
-                                  }, 1, 1, 2)
-    name = Name.find_by(text_name: "Agaricus novus")
-    assert(name)
-    assert_equal("Agaricus novus", name.text_name)
-  end
-
-  def test_create_observation_that_generates_email
-    QueuedEmail.queue = true
-    count_before = QueuedEmail.count
-    name = names(:agaricus_campestris)
-    name_trackers = NameTracker.where(name: name)
-    assert_equal(2, name_trackers.length,
-                 "Should be 2 name name_trackers for name ##{name.id}")
-    assert(name_trackers.map(&:user).include?(mary))
-    mary.update(no_emails: true)
-
-    where = "Simple, Massachusetts, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: name.text_name }
-                                  }, 1, 1, 0)
-    obs = assigns(:observation)
-    nam = assigns(:naming)
-
-    assert_equal(where, obs.where) # Make sure it's the right observation
-    assert_equal(name.id, nam.name_id) # Make sure it's the right name
-    assert_not_nil(obs.rss_log)
-    assert_equal(count_before + 1, QueuedEmail.count)
-    QueuedEmail.queue = false
-  end
-
-  def test_create_observation_with_decimal_geolocation_and_unknown_name
-    lat = 34.1622
-    lng = -118.3521
-    generic_construct_observation({
-                                    observation: { place_name: "",
-                                                   lat: lat, lng: lng },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-    obs = assigns(:observation)
-
-    assert_equal(lat.to_s, obs.lat.to_s)
-    assert_equal(lng.to_s, obs.lng.to_s)
-    assert_objs_equal(Location.unknown, obs.location)
-    assert_not_nil(obs.rss_log)
-  end
-
-  def test_create_observation_with_dms_geolocation_and_unknown_name
-    lat2 = "34°9’43.92”N"
-    lng2 = "118°21′7.56″W"
-    generic_construct_observation({
-                                    observation: { place_name: "",
-                                                   lat: lat2, lng: lng2 },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-    obs = assigns(:observation)
-
-    assert_equal("34.1622", obs.lat.to_s)
-    assert_equal("-118.3521", obs.lng.to_s)
-    assert_objs_equal(Location.unknown, obs.location)
-    assert_not_nil(obs.rss_log)
-  end
-
-  def test_create_observation_with_empty_geolocation_and_location
-    # Make sure it doesn't accept no location AND no lat/long.
-    generic_construct_observation({
-                                    observation: { place_name: "",
-                                                   lat: "", lng: "" },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0)
-  end
-
-  def test_create_observations_with_unknown_location_and_empty_geolocation
-    # But create observation if explicitly tell it "unknown" location.
-    generic_construct_observation({
-                                    observation: { place_name: "Earth",
-                                                   lat: "", lng: "" },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-  end
-
-  def test_create_observation_with_various_altitude_formats
-    [
-      ["500",     500],
-      ["500m",    500],
-      ["500 ft.", 152],
-      [" 500' ", 152]
-    ].each do |input, output|
-      where = "Unknown, Massachusetts, USA"
-
-      generic_construct_observation({
-                                      observation: { place_name: where,
-                                                     alt: input },
-                                      naming: { name: "Unknown" }
-                                    }, 1, 0, 0)
-      obs = assigns(:observation)
-
-      assert_equal(output, obs.alt)
-      assert_equal(where, obs.where) # Make sure it's the right observation
-      assert_not_nil(obs.rss_log)
-    end
-  end
-
-  def test_create_observation_creating_class
-    generic_construct_observation(
-      { observation: { place_name: "Earth", lat: "", lng: "" },
-        naming: { name: "Lecanoromycetes L." },
-        approved_name: "Lecanoromycetes L." },
-      1, 1, 1
-    )
-    name = Name.last
-    assert_equal("Lecanoromycetes", name.text_name)
-    assert_equal("L.", name.author)
-    assert_equal("Class", name.rank)
-  end
-
-  def test_create_observation_creating_family
-    params = {
-      observation: { place_name: "Earth", lat: "", lng: "" },
-      naming: { name: "Acarosporaceae" },
-      approved_name: "Acarosporaceae"
-    }
-    o_num = 1
-    g_num = 1
-    n_num = 1
-    user = rolf
-    o_count = Observation.count
-    g_count = Naming.count
-    n_count = Name.count
-    score   = user.reload.contribution
-    params  = modified_generic_params(params, user)
-
-    post_requires_login(:create, params)
-    name = Name.last
-
-    # assert_redirected_to(action: :show)
-    assert_response(:redirect)
-    assert_match(%r{/test.host/\d+\Z}, @response.redirect_url)
-    assert_equal(o_count + o_num, Observation.count, "Wrong Observation count")
-    assert_equal(g_count + g_num, Naming.count, "Wrong Naming count")
-    assert_equal(n_count + n_num, Name.count, "Wrong Name count")
-    assert_equal(score + o_num + g_num * 2 + n_num * 10,
-                 user.reload.contribution,
-                 "Wrong User score")
-    assert_not_equal(
-      0,
-      @controller.instance_variable_get(:@observation).thumb_image_id,
-      "Wrong image id"
-    )
-    assert_equal("Acarosporaceae", name.text_name)
-    assert_equal("Family", name.rank)
-  end
-
-  def test_create_observation_creating_group
-    generic_construct_observation(
-      { observation: { place_name: "Earth", lat: "", lng: "" },
-        naming: { name: "Morchella elata group" },
-        approved_name: "Morchella elata group" },
-      1, 1, 2
-    )
-    name = Name.last
-    assert_equal("Morchella elata group", name.text_name)
-    assert_equal("", name.author)
-    assert_equal("Group", name.rank)
-  end
-
-  def test_prevent_creation_of_species_under_deprecated_genus
-    login("katrina")
-    cladonia = Name.find_or_create_name_and_parents("Cladonia").last
-    cladonia.save!
-    cladonia_picta = Name.find_or_create_name_and_parents("Cladonia picta").last
-    cladonia_picta.save!
-    cladina = Name.find_or_create_name_and_parents("Cladina").last
-    cladina.change_deprecated(true)
-    cladina.save!
-    cladina.merge_synonyms(cladonia)
-
-    generic_construct_observation({
-                                    observation: { place_name: "Earth" },
-                                    naming: { name: "Cladina pictum" }
-                                  }, 0, 0, 0, roy)
-    assert_names_equal(cladina, assigns(:parent_deprecated))
-    assert_obj_arrays_equal([cladonia_picta], assigns(:valid_names))
-
-    generic_construct_observation({
-                                    observation: { place_name: "Earth" },
-                                    naming: { name: "Cladina pictum" },
-                                    approved_name: "Cladina pictum"
-                                  }, 1, 1, 1, roy)
-
-    name = Name.last
-    assert_equal("Cladina pictum", name.text_name)
-    assert_true(name.deprecated)
-  end
-
-  def test_construct_observation_dubious_place_names
-    # Test a reversed name with a scientific user
-    where = "USA, Massachusetts, Reversed"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0, roy)
-
-    # Test missing space.
-    where = "Reversible, Massachusetts,USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0)
-    # (This is accepted now for some reason.)
-    where = "USA,Massachusetts, Reversible"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0, roy)
-
-    # Test a bogus country name
-    where = "Bogus, Massachusetts, UAS"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0)
-    where = "UAS, Massachusetts, Bogus"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0, roy)
-
-    # Test a bad state name
-    where = "Bad State Name, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0)
-    where = "USA, Bad State Name"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0, roy)
-
-    # Test mix of city and county
-    where = "Burbank, Los Angeles Co., California, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-    where = "USA, California, Los Angeles Co., Burbank"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0, roy)
-
-    # Test mix of city and county
-    where = "Falmouth, Barnstable Co., Massachusetts, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-    where = "USA, Massachusetts, Barnstable Co., Falmouth"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0, roy)
-
-    # Test some bad terms
-    where = "Some County, Ohio, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0)
-    where = "Old Rd, Ohio, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 0, 0, 0)
-    where = "Old Rd., Ohio, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-
-    # Test some acceptable additions
-    where = "near Burbank, Southern California, USA"
-    generic_construct_observation({
-                                    observation: { place_name: where },
-                                    naming: { name: "Unknown" }
-                                  }, 1, 0, 0)
-  end
-
-  def test_name_resolution
-    login("rolf")
-
-    params = {
-      observation: {
-        when: Time.zone.now,
-        place_name: "Somewhere, Massachusetts, USA",
-        specimen: "0",
-        thumb_image_id: "0"
-      },
-      naming: {
-        vote: { value: "3" }
-      }
-    }
-    expected_page = new_location_path
-
-    # Can we create observation with existing genus?
-    agaricus = names(:agaricus)
-    params[:naming][:name] = "Agaricus"
-    params[:approved_name] = nil
-    post(:create, params: params)
-    # assert_template(action: expected_page)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-
-    params[:naming][:name] = "Agaricus sp"
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-
-    params[:naming][:name] = "Agaricus sp."
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-
-    # Can we create observation with genus and add author?
-    params[:naming][:name] = "Agaricus Author"
-    params[:approved_name] = "Agaricus Author"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-    assert_equal("Agaricus Author", agaricus.reload.search_name)
-    agaricus.author = nil
-    agaricus.search_name = "Agaricus"
-    agaricus.save
-
-    params[:naming][:name] = "Agaricus sp Author"
-    params[:approved_name] = "Agaricus sp Author"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-    assert_equal("Agaricus Author", agaricus.reload.search_name)
-    agaricus.author = nil
-    agaricus.search_name = "Agaricus"
-    agaricus.save
-
-    params[:naming][:name] = "Agaricus sp. Author"
-    params[:approved_name] = "Agaricus sp. Author"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-    assert_equal("Agaricus Author", agaricus.reload.search_name)
-
-    # Can we create observation with genus specifying author?
-    params[:naming][:name] = "Agaricus Author"
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-
-    params[:naming][:name] = "Agaricus sp Author"
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-
-    params[:naming][:name] = "Agaricus sp. Author"
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(agaricus.id, assigns(:observation).name_id)
-
-    # Can we create observation with deprecated genus?
-    psalliota = names(:psalliota)
-    params[:naming][:name] = "Psalliota"
-    params[:approved_name] = "Psalliota"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(psalliota.id, assigns(:observation).name_id)
-
-    params[:naming][:name] = "Psalliota sp"
-    params[:approved_name] = "Psalliota sp"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(psalliota.id, assigns(:observation).name_id)
-
-    params[:naming][:name] = "Psalliota sp."
-    params[:approved_name] = "Psalliota sp."
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(psalliota.id, assigns(:observation).name_id)
-
-    # Can we create observation with deprecated genus, adding author?
-    params[:naming][:name] = "Psalliota Author"
-    params[:approved_name] = "Psalliota Author"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(psalliota.id, assigns(:observation).name_id)
-    assert_equal("Psalliota Author", psalliota.reload.search_name)
-    psalliota.author = nil
-    psalliota.search_name = "Psalliota"
-    psalliota.save
-
-    params[:naming][:name] = "Psalliota sp Author"
-    params[:approved_name] = "Psalliota sp Author"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(psalliota.id, assigns(:observation).name_id)
-    assert_equal("Psalliota Author", psalliota.reload.search_name)
-    psalliota.author = nil
-    psalliota.search_name = "Psalliota"
-    psalliota.save
-
-    params[:naming][:name] = "Psalliota sp. Author"
-    params[:approved_name] = "Psalliota sp. Author"
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal(psalliota.id, assigns(:observation).name_id)
-    assert_equal("Psalliota Author", psalliota.reload.search_name)
-
-    # Can we create new quoted genus?
-    params[:naming][:name] = '"One"'
-    params[:approved_name] = '"One"'
-    post(:create, params: params)
-    # assert_template(controller: :observations, action: expected_page)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One"', assigns(:observation).name.text_name)
-    assert_equal('"One"', assigns(:observation).name.search_name)
-
-    params[:naming][:name] = '"Two" sp'
-    params[:approved_name] = '"Two" sp'
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"Two"', assigns(:observation).name.text_name)
-    assert_equal('"Two"', assigns(:observation).name.search_name)
-
-    params[:naming][:name] = '"Three" sp.'
-    params[:approved_name] = '"Three" sp.'
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"Three"', assigns(:observation).name.text_name)
-    assert_equal('"Three"', assigns(:observation).name.search_name)
-
-    params[:naming][:name] = '"One"'
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One"', assigns(:observation).name.text_name)
-
-    params[:naming][:name] = '"One" sp'
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One"', assigns(:observation).name.text_name)
-
-    params[:naming][:name] = '"One" sp.'
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One"', assigns(:observation).name.text_name)
-
-    # Can we create species under the quoted genus?
-    params[:naming][:name] = '"One" foo'
-    params[:approved_name] = '"One" foo'
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One" foo', assigns(:observation).name.text_name)
-
-    params[:naming][:name] = '"One" "bar"'
-    params[:approved_name] = '"One" "bar"'
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One" "bar"', assigns(:observation).name.text_name)
-
-    params[:naming][:name] = '"One" Author'
-    params[:approved_name] = '"One" Author'
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One"', assigns(:observation).name.text_name)
-    assert_equal('"One" Author', assigns(:observation).name.search_name)
-
-    params[:naming][:name] = '"One" sp Author'
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One"', assigns(:observation).name.text_name)
-    assert_equal('"One" Author', assigns(:observation).name.search_name)
-
-    params[:naming][:name] = '"One" sp. Author'
-    params[:approved_name] = nil
-    post(:create, params: params)
-    assert_redirected_to(/#{expected_page}/)
-    assert_equal('"One"', assigns(:observation).name.text_name)
-    assert_equal('"One" Author', assigns(:observation).name.search_name)
-  end
-
-  def test_create_observation_strip_images
-    login("rolf")
-
-    setup_image_dirs
-    fixture = "#{MO.root}/test/images/geotagged.jpg"
-    fixture = Rack::Test::UploadedFile.new(fixture, "image/jpeg")
-
-    old_img1 = images(:turned_over_image)
-    old_img2 = images(:in_situ_image)
-    assert_false(old_img1.gps_stripped)
-    assert_false(old_img2.gps_stripped)
-    assert_false(old_img1.transferred)
-    assert_false(old_img2.transferred)
-
-    orig_file = old_img1.full_filepath("orig")
-    path = orig_file.sub(%r{/[^/]*$}, "")
-    FileUtils.mkdir_p(path) unless File.directory?(path)
-    FileUtils.cp(fixture, orig_file)
-
-    post(
-      :create,
-      params: {
-        observation: {
-          when: Time.zone.now,
-          place_name: "Burbank, California, USA",
-          lat: "45.4545",
-          lng: "-90.1234",
-          alt: "456",
-          specimen: "0",
-          thumb_image_id: "0",
-          gps_hidden: "1"
-        },
-        image: {
-          "0" => {
-            image: fixture,
-            copyright_holder: "me",
-            when: Time.zone.now
-          }
-        },
-        good_image_ids: "#{old_img1.id} #{old_img2.id}"
-      }
-    )
-
-    obs = Observation.last
-    assert_equal(3, obs.images.length)
-    new_img = (obs.images - [old_img1, old_img2]).first
-    assert_true(new_img.gps_stripped)
-    # We have script/process_image disabled for tests, so it doesn't actually
-    # strip the uploaded image.
-    # assert_not_equal(File.size(fixture),
-    #                  File.size(new_img.full_filepath("orig")))
-
-    # Make sure it stripped the image which had already been created.
-    assert_true(old_img1.reload.gps_stripped)
-    assert_not_equal(File.size(fixture),
-                     File.size(old_img1.full_filepath("orig")))
-
-    # Second pre-existing image has missing file, so stripping should fail.
-    assert_false(old_img2.reload.gps_stripped)
-  end
-
-  ##############################################################################
-
-  # ----------------------------------------------------------------
-  #  Test :edit and :update (note :update uses method: :put)
-  # ----------------------------------------------------------------
-
-  # (Sorry, these used to all be edit/update_observation, now they're
-  # confused because of the naming stuff.)
-  def test_edit_observation_form
-    obs = observations(:coprinus_comatus_obs)
-    assert_equal("rolf", obs.user.login)
-    params = { id: obs.id }
-    requires_user(:edit,
-                  [{ controller: "/observations", action: :show }],
-                  params)
-
-    assert_form_action(action: :update, id: obs.id)
-
-    # image notes field must be textarea -- not just text -- because text
-    # is inline and would drops any newlines in the image notes
-    assert_select("textarea[id = 'good_image_#{obs.images.first.id}_notes']",
-                  count: 1)
-  end
-
-  def test_edit_observation_form_no_open
-    obs = observations(:amateur_obs)
-    project = projects(:open_membership_project)
-    login("katrina")
-    get(:edit, params: { id: obs.id })
-    assert_project_checks(project.id => :unchecked)
-  end
-
-  def test_update_observation
-    obs = observations(:detailed_unknown_obs)
-    updated_at = obs.rss_log.updated_at
-    new_where = "Somewhere In, Japan"
-    new_notes = { other: "blather blather blather" }
-    new_specimen = false
-    img = images(:in_situ_image)
-    params = {
-      id: obs.id,
-      observation: {
-        notes: new_notes,
-        place_name: new_where,
-        "when(1i)" => "2001",
-        "when(2i)" => "2",
-        "when(3i)" => "3",
-        specimen: new_specimen,
-        thumb_image_id: "0"
-      },
-      good_image_ids: "#{img.id} #{images(:turned_over_image).id}",
-      good_image: {
-        img.id => {
-          notes: "new notes",
-          original_name: "new name",
-          copyright_holder: "someone else",
-          "when(1i)" => "2012",
-          "when(2i)" => "4",
-          "when(3i)" => "6",
-          license_id: licenses(:ccwiki30).id
-        }
-      },
-      log_change: "1"
-    }
-    put_requires_user(
-      :update,
-      [{ controller: "/observations", action: :show }],
-      params,
-      "mary"
-    )
-    assert_redirected_to(/#{new_location_path}/)
-    assert_equal(10, rolf.reload.contribution)
-    obs = assigns(:observation)
-    assert_equal(new_where, obs.where)
-    assert_equal("2001-02-03", obs.when.to_s)
-    assert_equal(new_notes, obs.notes)
-    assert_equal(new_specimen, obs.specimen)
-    assert_not_equal(updated_at, obs.rss_log.updated_at)
-    assert_not_equal(0, obs.thumb_image_id)
-    img = img.reload
-    assert_equal("new notes", img.notes)
-    assert_equal("new name", img.original_name)
-    assert_equal("someone else", img.copyright_holder)
-    assert_equal("2012-04-06", img.when.to_s)
-    assert_equal(licenses(:ccwiki30), img.license)
-  end
-
-  def test_update_observation_no_logging
-    obs = observations(:detailed_unknown_obs)
-    updated_at = obs.rss_log.updated_at
-    where = "Somewhere, China"
-    params = {
-      id: obs.id,
-      observation: {
-        place_name: where,
-        when: obs.when,
-        notes: obs.notes,
-        specimen: obs.specimen
-      },
-      log_change: "0"
-    }
-    put_requires_user(
-      :update,
-      [{ controller: "/observations", action: :show }],
-      params,
-      "mary"
-    )
-    assert_redirected_to(/#{new_location_path}/)
-    assert_equal(10, rolf.reload.contribution)
-    obs = assigns(:observation)
-    assert_equal(where, obs.where)
-    assert_equal(updated_at, obs.rss_log.updated_at)
-  end
-
-  def test_update_observation_bad_place_name
-    obs = observations(:detailed_unknown_obs)
-    new_where = "test_update_observation"
-    new_notes = { other: "blather blather blather" }
-    new_specimen = false
-    params = {
-      id: obs.id,
-      observation: {
-        place_name: new_where,
-        "when(1i)" => "2001",
-        "when(2i)" => "2",
-        "when(3i)" => "3",
-        notes: new_notes,
-        specimen: new_specimen,
-        thumb_image_id: "0"
-      },
-      log_change: "1"
-    }
-    put_requires_user(
-      :update,
-      [{ controller: "/observations", action: :show }],
-      params,
-      "mary"
-    )
-    assert_response(:success) # Which really means failure
-  end
-
-  def test_update_observation_with_another_users_image
-    img1 = images(:in_situ_image)
-    img2 = images(:turned_over_image)
-    img3 = images(:commercial_inquiry_image)
-
-    obs = observations(:detailed_unknown_obs)
-    obs.images << img3
-    obs.save
-    obs.reload
-
-    assert_equal(img1.user_id, obs.user_id)
-    assert_equal(img2.user_id, obs.user_id)
-    assert_not_equal(img3.user_id, obs.user_id)
-
-    img_ids = obs.images.map(&:id)
-    assert_equal([img1.id, img2.id, img3.id], img_ids)
-
-    old_img1_notes = img1.notes
-    old_img3_notes = img3.notes
-
-    params = {
-      id: obs.id,
-      observation: {
-        place_name: obs.place_name,
-        when: obs.when,
-        notes: obs.notes,
-        specimen: obs.specimen,
-        thumb_image_id: "0"
-      },
-      good_image_ids: img_ids.map(&:to_s).join(" "),
-      good_image: {
-        img2.id => { notes: "new notes for two" },
-        img3.id => { notes: "new notes for three" }
-      }
-    }
-    login("mary")
-    put(:update, params: params)
-    assert_redirected_to(action: :show)
-    assert_flash_success
-    assert_equal(old_img1_notes, img1.reload.notes)
-    assert_equal("new notes for two", img2.reload.notes)
-    assert_equal(old_img3_notes, img3.reload.notes)
-  end
-
-  def test_update_observation_with_non_image
-    obs = observations(:minimal_unknown_obs)
-    file = Rack::Test::UploadedFile.new(
-      Rails.root.join("test/fixtures/projects.yml").to_s, "text/plain"
-    )
-    params = {
-      id: obs.id,
-      observation: {
-        place_name: obs.place_name,
-        when: obs.when,
-        notes: obs.notes,
-        specimen: obs.specimen,
-        thumb_image_id: "0"
-      },
-      good_image_ids: "",
-      good_image: {},
-      image: {
-        "0" => {
-          image: file,
-          when: Time.zone.now
-        }
-      }
-    }
-    login("mary")
-    put(:update, params: params)
-
-    # 200 :success means means failure!
-    assert_response(
-      :success,
-      "Expected 200 (OK), Got #{@response.status} (#{@response.message})"
-    )
-    assert_flash_error
-  end
-
-  def test_update_observation_strip_images
-    login("mary")
-    obs = observations(:detailed_unknown_obs)
-
-    setup_image_dirs
-    fixture = "#{MO.root}/test/images/geotagged.jpg"
-    fixture = Rack::Test::UploadedFile.new(fixture, "image/jpeg")
-
-    old_img1 = images(:turned_over_image)
-    old_img2 = images(:in_situ_image)
-    assert_false(old_img1.gps_stripped)
-    assert_false(old_img2.gps_stripped)
-
-    orig_file = old_img1.full_filepath("orig")
-    path = orig_file.sub(%r{/[^/]*$}, "")
-    FileUtils.mkdir_p(path) unless File.directory?(path)
-    FileUtils.cp(fixture, orig_file)
-
-    put(
-      :update,
-      params: {
-        id: obs.id,
-        observation: {
-          gps_hidden: "1"
-        },
-        good_image_ids: "#{old_img1.id} #{old_img2.id}",
-        image: {
-          "0" => {
-            image: fixture,
-            copyright_holder: "me",
-            when: Time.zone.now
-          }
-        }
-      }
-    )
-
-    obs.reload
-    old_img1.reload
-    old_img2.reload
-
-    assert_equal(3, obs.images.length)
-    new_img = (obs.images - [old_img1, old_img2]).first
-
-    assert_true(new_img.gps_stripped)
-    # We have script/process_image disabled for tests, so it doesn't actually
-    # strip the uploaded image.
-    # assert_not_equal(File.size(fixture),
-    #                  File.size(new_img.full_filepath("orig")))
-
-    # Make sure it stripped the image which had already been created.
-    assert_true(old_img1.reload.gps_stripped)
-    assert_not_equal(File.size(fixture),
-                     File.size(old_img1.full_filepath("orig")))
-
-    # Second pre-existing image has missing file, so stripping should fail.
-    assert_false(old_img2.reload.gps_stripped)
-  end
-
-  # --------------------------------------------------------------------
-  #  Test notes with template create_observation, and edit_observation,
-  #  both "get" and "post".
-  # --------------------------------------------------------------------
-
-  # Prove that create_observation renders note fields with template keys first,
-  # in the order listed in the template
-  def test_new_observation_with_notes_template
-    user = users(:notes_templater)
-    login(user.login)
-    get(:new)
-
-    assert_page_has_correct_notes_areas(
-      expect_areas: { Cap: "", Nearby_trees: "", odor: "", Other: "" }
-    )
-  end
-
-  # Prove that notes are saved with template keys first, in the order listed in
-  # the template, then Other, but without blank fields
-  def test_create_observation_with_notes_template
-    user = users(:notes_templater)
-    params = { observation: sample_obs_fields }
-    # Use defined Location to avoid issues with reloading Observation
-    params[:observation][:place_name] = locations(:albion).name
-    params[:observation][:notes] = {
-      Nearby_trees: "?",
-      Observation.other_notes_key => "Some notes",
-      odor: "",
-      Cap: "red"
-    }
-    expected_notes = {
-      Cap: "red",
-      Nearby_trees: "?",
-      Observation.other_notes_key => "Some notes"
-    }
-    o_size = Observation.count
-
-    login(user.login)
-    post(:create, params: params)
-
-    assert_equal(o_size + 1, Observation.count)
-    obs = Observation.last.reload
-    assert_redirected_to(action: :show, id: obs.id)
-    assert_equal(expected_notes, obs.notes)
-  end
-
-  # Prove that edit_observation has correct note fields and content:
-  # Template fields first, in template order; then orphaned fields in order
-  # in which they appear in observation, then Other
-  def test_edit_observation_with_notes_template
-    obs    = observations(:templater_noteless_obs)
-    user   = obs.user
-    params = {
-      id: obs.id,
-      observation: {
-        place_name: obs.location.name,
-        lat: "",
-        lng: "",
-        alt: "",
-        "when(1i)" => obs.when.year,
-        "when(2i)" => obs.when.month,
-        "when(3i)" => obs.when.day,
-        specimen: "0",
-        thumb_image_id: "0",
-        notes: obs.notes
-      },
-      herbarium_record: default_herbarium_record_fields,
-      username: user.login,
-      naming: {
-        vote: { value: "3" }
-      }
-    }
-
-    login(user.login)
-    get(:edit, params: params)
-    assert_page_has_correct_notes_areas(
-      expect_areas: { Cap: "", Nearby_trees: "", odor: "",
-                      Observation.other_notes_key => "" }
-    )
-
-    obs         = observations(:templater_other_notes_obs)
-    params[:id] = obs.id
-    params[:observation][:notes] = obs.notes
-    get(:edit, params: params)
-    assert_page_has_correct_notes_areas(
-      expect_areas: { Cap: "", Nearby_trees: "", odor: "",
-                      Observation.other_notes_key => "some notes" }
-    )
-  end
-
-  def test_update_observation_with_notes_template
-    # Prove notes_template works when editing Observation without notes
-    obs = observations(:templater_noteless_obs)
-    user = obs.user
-    notes = {
-      Cap: "dark red",
-      Nearby_trees: "?",
-      odor: "farinaceous"
-    }
-    params = {
-      id: obs.id,
-      observation: { notes: notes }
-    }
-    login(user.login)
-    put(:update, params: params)
-
-    assert_redirected_to(action: :show, id: obs.id)
-    assert_equal(notes, obs.reload.notes)
-  end
-
-  # -----------------------------------
-  #  Test extended observation forms.
-  # -----------------------------------
-
-  def test_javascripty_name_reasons
-    login("rolf")
-
-    # If javascript isn't enabled, then checkbox isn't required.
-    post(:create,
-         params: {
-           observation: { place_name: "Where, Japan", when: Time.zone.now },
-           naming: {
-             name: names(:coprinus_comatus).text_name,
-             vote: { value: 3 },
-             reasons: {
-               "1" => { check: "0", notes: "" },
-               "2" => { check: "0", notes: "foo" },
-               "3" => { check: "1", notes: ""    },
-               "4" => { check: "1", notes: "bar" }
-             }
-           }
-         })
-    assert_response(:redirect) # redirected = successfully created
-    naming = Naming.find(assigns(:naming).id)
-    reasons = naming.reasons_array.select(&:used?).map(&:num).sort
-    assert_equal([2, 3, 4], reasons)
-
-    # If javascript IS enabled, then checkbox IS required.
-    post(:create,
-         params: {
-           observation: { place_name: "Where, Japan", when: Time.zone.now },
-           naming: {
-             name: names(:coprinus_comatus).text_name,
-             vote: { value: 3 },
-             reasons: {
-               "1" => { check: "0", notes: "" },
-               "2" => { check: "0", notes: "foo" },
-               "3" => { check: "1", notes: ""    },
-               "4" => { check: "1", notes: "bar" }
-             }
-           },
-           was_js_on: "yes"
-         })
-    assert_response(:redirect) # redirected = successfully created
-    naming = Naming.find(assigns(:naming).id)
-    reasons = naming.reasons_array.select(&:used?).map(&:num).sort
-    assert_equal([3, 4], reasons)
-  end
-
-  def test_create_with_image_upload
-    login("rolf")
-
-    time0 = Time.utc(2000)
-    time1 = Time.utc(2001)
-    time2 = Time.utc(2002)
-    time3 = Time.utc(2003)
-    week_ago = 1.week.ago
-
-    setup_image_dirs
-    file = Rails.root.join("test/images/Coprinus_comatus.jpg")
-    file1 = Rack::Test::UploadedFile.new(file, "image/jpeg")
-    file2 = Rack::Test::UploadedFile.new(file, "image/jpeg")
-    file3 = Rack::Test::UploadedFile.new(file, "image/jpeg")
-
-    new_image1 = Image.create(
-      copyright_holder: "holder_1",
-      when: time1,
-      notes: "notes_1",
-      user_id: users(:rolf).id,
-      image: file1,
-      content_type: "image/jpeg",
-      created_at: week_ago
-    )
-
-    new_image2 = Image.create(
-      copyright_holder: "holder_2",
-      when: time2,
-      notes: "notes_2",
-      user_id: users(:rolf).id,
-      image: file2,
-      content_type: "image/jpeg",
-      created_at: week_ago
-    )
-
-    # assert(new_image1.updated_at < 1.day.ago)
-    # assert(new_image2.updated_at < 1.day.ago)
-    File.stub(:rename, false) do
-      post(
-        :create,
-        params: {
-          observation: {
-            place_name: "Zzyzx, Japan",
-            when: time0,
-            thumb_image_id: 0, # (make new image the thumbnail)
-            notes: { Observation.other_notes_key => "blah" }
-          },
-          image: {
-            "0" => {
-              image: file3,
-              copyright_holder: "holder_3",
-              when: time3,
-              notes: "notes_3"
-            }
-          },
-          good_image: {
-            new_image1.id.to_s => {},
-            new_image2.id.to_s => {
-              notes: "notes_2_new"
-            }
-          },
-          # (attach these two images once observation created)
-          good_image_ids: "#{new_image1.id} #{new_image2.id}"
-        }
-      )
-    end
-    assert_response(:redirect) # redirected = successfully created
-
-    obs = Observation.find_by(where: "Zzyzx, Japan")
-    assert_equal(rolf.id, obs.user_id)
-    assert_equal(time0, obs.when)
-    assert_equal("Zzyzx, Japan", obs.place_name)
-
-    new_image1.reload
-    new_image2.reload
-    imgs = obs.images.sort_by(&:id)
-    img_ids = imgs.map(&:id)
-    assert_equal([new_image1.id, new_image2.id, new_image2.id + 1], img_ids)
-    assert_equal(new_image2.id + 1, obs.thumb_image_id)
-    assert_equal("holder_1", imgs[0].copyright_holder)
-    assert_equal("holder_2", imgs[1].copyright_holder)
-    assert_equal("holder_3", imgs[2].copyright_holder)
-    assert_equal(time1, imgs[0].when)
-    assert_equal(time2, imgs[1].when)
-    assert_equal(time3, imgs[2].when)
-    assert_equal("notes_1",     imgs[0].notes)
-    assert_equal("notes_2_new", imgs[1].notes)
-    assert_equal("notes_3",     imgs[2].notes)
-    # assert(imgs[0].updated_at < 1.day.ago) # notes not changed
-    # assert(imgs[1].updated_at > 1.day.ago) # notes changed
-  end
-
-  def test_image_upload_when_create_fails
-    login("rolf")
-
-    setup_image_dirs
-    file = Rails.root.join("test/images/Coprinus_comatus.jpg")
-    file = Rack::Test::UploadedFile.new(file, "image/jpeg")
-    File.stub(:rename, false) do
-      post(
-        :create,
-        params: {
-          observation: {
-            place_name: "", # will cause failure
-            when: Time.zone.now
-          },
-          image: { "0": { image: file,
-                          copyright_holder: "zuul",
-                          when: Time.zone.now } }
-        }
-      )
-      assert_response(:success) # success = failure, paradoxically
-    end
-    # Make sure image was created, but that it is unattached, and that it has
-    # been kept in the @good_images array for attachment later.
-    img = Image.find_by(copyright_holder: "zuul")
-    assert(img)
-    assert_equal([], img.observations)
-    assert_equal([img.id],
-                 @controller.instance_variable_get(:@good_images).map(&:id))
-  end
-
-  def test_image_upload_when_process_image_fails
-    setup_image_dirs
-    file = Rails.root.join("test/images/Coprinus_comatus.jpg")
-    file = Rack::Test::UploadedFile.new(file, "image/jpeg")
-    image = Image.create(user: users(:rolf),
-                         copyright_holder: "zuul",
-                         when: Time.current,
-                         notes: "stubbed in test")
-    params = {
-      observation: { place_name: "USA",
-                     when: Time.current },
-      image: {
-        "0" => {
-          image: file,
-          copyright_holder: "zuul",
-          when: Time.current
-        }
-      }
-    }
-    login("rolf")
-
-    # Simulate process_image failure.
-    Image.stub(:new, image) do
-      image.stub(:process_image, false) do
-        post(:create, params: params)
-      end
-    end
-
-    img = Image.find_by(copyright_holder: "zuul")
-
-    assert(img, "Failed to create image")
-    assert_equal([], img.observations, "Image should be unattached")
-    assert_includes(@controller.instance_variable_get(:@bad_images), img,
-                    "Failed to include image in @bad_images")
-    assert_empty(@controller.instance_variable_get(:@good_images),
-                 "Incorrectly included image in @good_images")
-  end
-
-  def test_inital_project_checkboxes
-    login("foray_newbie")
-    get(:new)
-
-    assert_project_checks(
-      # open membership, meets date constrains
-      projects(:current_project).id => :checked,
-      # open-membership, doesn't meet date constraints
-      projects(:past_project).id => :unchecked,
-      # meets date constraints, but not a member
-      projects(:eol_project).id => :no_field
-    )
-  end
-
-  def test_field_slip_project_checkbox
-    login("katrina")
-    slip = field_slips(:field_slip_no_obs)
-    get(:new, params: { field_code: slip.code })
-
-    User.current.project_members.each do |membership|
-      proj = membership.project
-      if proj == slip.project || (proj.current? && proj.field_slip_prefix.nil?)
-        assert_project_checks(proj.id => :checked)
-      else
-        assert_project_checks(proj.id => :unchecked)
-      end
-    end
-  end
-
-  def test_notes_to_name
-    login("katrina")
-    name = names(:coprinus_comatus)
-    get(:new, params: { notes: { Field_Slip_ID: name.text_name } })
-
-    assert_match(name.text_name, @response.body)
-  end
-
-  def test_project_checkboxes_in_create_observation
-    init_for_project_checkbox_tests
-
-    login("dick")
-    get(:new)
-    assert_project_checks(@proj1.id => :no_field, @proj2.id => :unchecked)
-
-    # Should have different default
-    # if recently posted observation attached to project.
-    obs = Observation.create!
-    @proj2.add_observation(obs)
-    get(:new)
-    assert_project_checks(@proj1.id => :no_field, @proj2.id => :checked)
-
-    # Make sure it remember state of checks if submit fails.
-    post(:create,
-         params: {
-           naming: { name: "Screwy Name" }, # (ensures it will fail)
-           project: { "id_#{@proj1.id}" => "0" }
-         })
-    assert_project_checks(@proj1.id => :no_field, @proj2.id => :unchecked)
-  end
-
-  def test_project_checkboxes_in_update_observation
-    init_for_project_checkbox_tests
-
-    login("rolf")
-    get(:edit, params: { id: @obs1.id })
-    assert_response(:redirect)
-    get(:edit, params: { id: @obs2.id })
-    assert_project_checks(@proj1.id => :unchecked, @proj2.id => :no_field)
-    put(
-      :update,
-      params: {
-        id: @obs2.id,
-        observation: { place_name: "blah blah blah" }, # (ensures it will fail)
-        project: { "id_#{@proj1.id}" => "1" },
-        good_image_ids: @obs2_img_ids.join(" ") # necessary?
-      }
-    )
-    assert_project_checks(@proj1.id => :checked, @proj2.id => :no_field)
-    put(
-      :update,
-      params: {
-        id: @obs2.id,
-        project: { "id_#{@proj1.id}" => "1" },
-        good_image_ids: @obs2_img_ids.join(" ") # necessary?
-      }
-    )
-    assert_response(:redirect)
-    assert_obj_arrays_equal([@proj1], @obs2.reload.projects)
-    assert_obj_arrays_equal([@proj1], @img2.reload.projects)
-
-    login("mary")
-    get(:edit, params: { id: @obs2.id })
-    assert_project_checks(@proj1.id => :checked, @proj2.id => :unchecked)
-    get(:edit, params: { id: @obs1.id })
-    assert_project_checks(@proj1.id => :unchecked, @proj2.id => :checked)
-    put(
-      :update,
-      params: {
-        id: @obs1.id,
-        observation: { place_name: "blah blah blah" }, # (ensures it will fail)
-        project: {
-          "id_#{@proj1.id}" => "1",
-          "id_#{@proj2.id}" => "0"
-        },
-        good_image_ids: @obs1_img_ids.join(" ")
-      }
-    )
-    assert_project_checks(@proj1.id => :checked, @proj2.id => :unchecked)
-    put(
-      :update,
-      params: {
-        id: @obs1.id,
-        project: {
-          "id_#{@proj1.id}" => "1",
-          "id_#{@proj2.id}" => "1"
-        },
-        good_image_ids: @obs1_img_ids.join(" ")
-      }
-    )
-    assert_response(:redirect)
-    assert_obj_arrays_equal([@proj1, @proj2], @obs1.reload.projects, :sort)
-    assert_obj_arrays_equal([@proj1, @proj2], @img1.reload.projects, :sort)
-
-    login("dick")
-    get(:edit, params: { id: @obs2.id })
-    assert_response(:redirect)
-    get(:edit, params: { id: @obs1.id })
-    assert_project_checks(@proj1.id => :checked_but_disabled,
-                          @proj2.id => :checked)
-  end
-
-  def init_for_project_checkbox_tests
-    @proj1 = projects(:eol_project)
-    @proj2 = projects(:bolete_project)
-    @obs1 = observations(:detailed_unknown_obs)
-    @obs2 = observations(:coprinus_comatus_obs)
-    @obs1_imgs = @obs1.images
-    @obs2_imgs = @obs2.images
-    @img1 = @obs1_imgs.first
-    @img2 = @obs2_imgs.first
-    @obs1_img_ids = @obs1_imgs.map(&:id)
-    @obs2_img_ids = @obs2_imgs.map(&:id)
-  end
-
-  def assert_project_checks(project_states)
-    project_states.each do |id, state|
-      assert_checkbox_state("project_id_#{id}", state)
-    end
-  end
-
-  def test_project_observation_location
-    project = projects(:albion_project)
-    obs = observations(:california_obs)
-
-    login("dick")
-    put(
-      :update,
-      params: {
-        id: obs.id,
-        observation: { place_name: obs.place_name },
-        project: { "id_#{project.id}" => "1" }
-      }
-    )
-    assert_flash_warning
-    assert_project_checks(project.id => :checked)
-    put(
-      :update,
-      params: {
-        id: obs.id,
-        observation: { place_name: obs.place_name },
-        project: {
-          "id_#{project.id}" => "1",
-          :ignore_proj_conflicts => "1"
-        }
-      }
-    )
-    assert_flash_success
-    assert_response(:redirect)
-    assert_obj_arrays_equal([project], obs.reload.projects)
-  end
-
-  def test_no_warning_for_associated_projects
-    project = projects(:albion_project)
-    obs = observations(:california_obs)
-    obs.projects << project
-    obs.save!
-
-    login("dick")
-    put(
-      :update,
-      params: {
-        id: obs.id,
-        observation: { place_name: obs.place_name },
-        project: { "id_#{project.id}" => "1" }
-      }
-    )
-    assert_no_flash
-    assert_response(:redirect)
-  end
-
-  def test_project_observation_good_location
-    project = projects(:wrangel_island_project)
-    obs = observations(:perkatkun_obs)
-
-    login("dick")
-    put(
-      :update,
-      params: {
-        id: obs.id,
-        observation: { place_name: obs.place_name },
-        project: { "id_#{project.id}" => "1" }
-      }
-    )
-    assert_response(:redirect)
-    assert_obj_arrays_equal([project], obs.reload.projects)
-  end
-
-  def test_list_checkboxes_in_create_observation
-    init_for_list_checkbox_tests
-
-    login("rolf")
-    get(:new)
-    assert_list_checks(@spl1.id => :unchecked, @spl2.id => :no_field)
-
-    login("mary")
-    get(:new)
-    assert_list_checks(@spl1.id => :no_field, @spl2.id => :unchecked)
-
-    login("katrina")
-    get(:new)
-    assert_list_checks(@spl1.id => :no_field, @spl2.id => :no_field)
-
-    # Dick is on project that owns @spl2.
-    login("dick")
-    get(:new)
-    assert_list_checks(@spl1.id => :no_field, @spl2.id => :unchecked)
-
-    # Should have different default
-    # if recently posted observation attached to project.
-    obs = Observation.create!
-    @spl1.add_observation(obs) # (shouldn't affect anything for create)
-    @spl2.add_observation(obs)
-    get(:new)
-    assert_list_checks(@spl1.id => :no_field, @spl2.id => :checked)
-
-    # Make sure it remember state of checks if submit fails.
-    post(
-      :create,
-      params: {
-        naming: { name: "Screwy Name" }, # (ensures it will fail)
-        list: { "id_#{@spl2.id}" => "0" }
-      }
-    )
-    assert_list_checks(@spl1.id => :no_field, @spl2.id => :unchecked)
-  end
-
-  def test_list_checkboxes_in_update_observation
-    init_for_list_checkbox_tests
-
-    login("rolf")
-    get(:edit, params: { id: @obs1.id })
-    assert_list_checks(@spl1.id => :unchecked, @spl2.id => :no_field)
-    spl_start_length = @spl1.observations.length
-    put(
-      :update,
-      params: {
-        id: @obs1.id,
-        observation: { place_name: "blah blah blah" }, # (ensures it will fail)
-        list: { "id_#{@spl1.id}" => "1" }
-      }
-    )
-    assert_equal(spl_start_length, @spl1.reload.observations.length)
-    assert_list_checks(@spl1.id => :checked, @spl2.id => :no_field)
-    put(
-      :update,
-      params: {
-        id: @obs1.id,
-        list: { "id_#{@spl1.id}" => "1" }
-      }
-    )
-    assert_equal(spl_start_length + 1, @spl1.reload.observations.length)
-    assert_response(:redirect)
-    assert_obj_arrays_equal([@spl1], @obs1.reload.species_lists)
-    get(:edit, params: { id: @obs2.id })
-    assert_response(:redirect)
-
-    login("mary")
-    get(:edit, params: { id: @obs1.id })
-    assert_response(:redirect)
-    get(:edit, params: { id: @obs2.id })
-    assert_list_checks(@spl1.id => :no_field, @spl2.id => :checked)
-    @spl1.add_observation(@obs2)
-    get(:edit, params: { id: @obs2.id })
-    assert_list_checks(@spl1.id => :checked_but_disabled, @spl2.id => :checked)
-
-    login("dick")
-    get(:edit, params: { id: @obs2.id })
-    assert_list_checks(@spl1.id => :checked_but_disabled, @spl2.id => :checked)
-  end
-
-  def init_for_list_checkbox_tests
-    @spl1 = species_lists(:first_species_list)
-    @spl2 = species_lists(:unknown_species_list)
-    @obs1 = observations(:unlisted_rolf_obs)
-    @obs2 = observations(:detailed_unknown_obs)
-    assert_users_equal(rolf, @spl1.user)
-    assert_users_equal(mary, @spl2.user)
-    assert_users_equal(rolf, @obs1.user)
-    assert_users_equal(mary, @obs2.user)
-    assert_obj_arrays_equal([], @obs1.species_lists)
-    assert_obj_arrays_equal([@spl2], @obs2.species_lists)
-  end
-
-  def assert_list_checks(list_states)
-    list_states.each do |id, state|
-      assert_checkbox_state("list_id_#{id}", state)
-    end
-  end
-
-  # ----------------------------
-  #  Interest.
-  # ----------------------------
-
-  def test_interest_in_show_observation
-    login("rolf")
-    minimal_unknown = observations(:minimal_unknown_obs)
-
-    # No interest in this observation yet.
-    #
-    # <img[^>]+watch.*\.png[^>]+>[\w\s]*
-    get(:show, params: { id: minimal_unknown.id })
-    assert_response(:success)
-    assert_image_link_in_html(
-      /watch.*\.png/,
-      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 1)
-    )
-    assert_image_link_in_html(
-      /ignore.*\.png/,
-      set_interest_path(type: "Observation", id: minimal_unknown.id, state: -1)
-    )
-
-    # Turn interest on and make sure there is an icon linked to delete it.
-    Interest.create(target: minimal_unknown, user: rolf, state: true)
-    get(:show, params: { id: minimal_unknown.id })
-    assert_response(:success)
-    assert_image_link_in_html(
-      /halfopen.*\.png/,
-      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 0)
-    )
-    assert_image_link_in_html(
-      /ignore.*\.png/,
-      set_interest_path(type: "Observation", id: minimal_unknown.id, state: -1)
-    )
-
-    # Destroy that interest, create new one with interest off.
-    Interest.where(user_id: rolf.id).last.destroy
-    Interest.create(target: minimal_unknown, user: rolf, state: false)
-    get(:show, params: { id: minimal_unknown.id })
-    assert_response(:success)
-    assert_image_link_in_html(
-      /halfopen.*\.png/,
-      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 0)
-    )
-    assert_image_link_in_html(
-      /watch.*\.png/,
-      set_interest_path(type: "Observation", id: minimal_unknown.id, state: 1)
-    )
-  end
-
-  ###################
-
-  def test_index_observation_by_past_by
-    login
-    get(:index, params: { by: :modified })
-    assert_response(:success)
-
-    get(:index, params: { by: :created })
-    assert_response(:success)
-  end
-
-  def test_external_sites_user_can_add_links_to
-    # not logged in
-    do_external_sites_test([], nil, nil)
-    # dick is neither owner nor member of any site's project
-    do_external_sites_test([], dick, observations(:agaricus_campestris_obs))
-    # rolf is owner
-    do_external_sites_test(ExternalSite.all, rolf,
-                           observations(:agaricus_campestris_obs))
-    # mary is member some sites' project
-    do_external_sites_test(mary.external_sites, mary,
-                           observations(:agaricus_campestris_obs))
-    # but there is already a link on this obs
-    do_external_sites_test([], mary, observations(:coprinus_comatus_obs))
-  end
-
-  def do_external_sites_test(expect, user, obs)
-    User.current = user
-    actual = @controller.helpers.external_sites_user_can_add_links_to(obs)
-    assert_equal(expect.map(&:name), actual.map(&:name))
-  end
-
-  def test_show_observation_votes
-    obs = observations(:coprinus_comatus_obs)
-    naming1 = obs.namings.first
-    naming2 = obs.namings.last
-    vote1 = naming1.votes.find_by(user: rolf)
-    vote2 = naming2.votes.find_by(user: rolf)
-    login("rolf")
-    get(:show, params: { id: obs.id })
-    assert_response(:success)
-    assert_template("show")
-    assert_select("form#naming_vote_form_#{naming1.id} " \
-                  "select#vote_value_#{naming1.id}>" \
-                  "option[selected=selected][value='#{vote1.value}']")
-    assert_select("form#naming_vote_form_#{naming2.id} " \
-                  "select#vote_value_#{naming2.id}>" \
-                  "option[selected=selected][value='#{vote2.value}']")
-  end
-end
diff --git a/test/integration/capybara/projects_integration_test.rb b/test/integration/capybara/projects_integration_test.rb
index 1e17cace7a..5667809e8b 100644
--- a/test/integration/capybara/projects_integration_test.rb
+++ b/test/integration/capybara/projects_integration_test.rb
@@ -69,6 +69,25 @@ def test_project_change_to_any_dates
     assert_nil(project.end_date, "Project Start Date should be nil")
   end
 
+  def test_project_maintain_dates
+    project = projects(:pinned_date_range_project)
+    start_date = project.start_date
+    assert(start_date < Time.zone.today)
+    end_date = project.end_date
+    assert(end_date < Time.zone.today)
+    login(project.user.login)
+
+    visit(project_path(project))
+    click_on(:show_project_edit.l)
+    click_on(:SAVE_EDITS.l)
+
+    project.reload
+    assert(project.start_date == start_date,
+           "Project Start Date should not be today")
+    assert(project.end_date == end_date,
+           "Project Start Date should not be today")
+  end
+
   def test_project_violations
     project = projects(:falmouth_2023_09_project)
 
diff --git a/test/models/queued_email_test.rb b/test/models/queued_email_test.rb
index f19f39d238..eafb5502dd 100644
--- a/test/models/queued_email_test.rb
+++ b/test/models/queued_email_test.rb
@@ -35,9 +35,9 @@ def test_verify_account_with_user
     # User.current should always be nil when the VerifyAccount email is
     # created, so this should never happen, but somehow *has* happened multiple
     # times in the wild.  It's worth testing.
-    User.current = @dick
-    QueuedEmail::VerifyAccount.create_email(@dick)
+    User.current = dick
+    QueuedEmail::VerifyAccount.create_email(dick)
     email = QueuedEmail.last
-    assert_nil(email.user)
+    assert_nil(email&.user)
   end
 end
diff --git a/test/system/observation_form_system_test.rb b/test/system/observation_form_system_test.rb
index 8d5920ea18..3f3b6778ab 100644
--- a/test/system/observation_form_system_test.rb
+++ b/test/system/observation_form_system_test.rb
@@ -394,7 +394,8 @@ def test_post_edit_and_destroy_with_details_and_location
     # Carousel items are re-output with image records this time.
     all(".carousel-indicator").last.click
 
-    second_item = find(".carousel-item", text: "25.7582")
+    assert_selector(".carousel-item", text: "25.7582", visible: :all)
+    second_item = find(".carousel-item", text: "25.7582", visible: :all)
     items = all(".carousel-item", visible: :all)
     assert_equal(items.length, 2)