Fix failing specs

MushroomObserver · Aug 11, 2022 · 0454ce7 · 0454ce7
1 parent f10a367
commit 0454ce7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/classes/report/darwin/eol_images.rb b/app/classes/report/darwin/eol_images.rb
@@ -42,7 +42,7 @@ def add_rank_condition(table)
       def tables
         @tables ||= {
           images: Image.arel_table,
-          images_observations: Arel::Table.new(:images_observations),
+          observation_images: Arel::Table.new(:observation_images),
           licenses: License.arel_table,
           names: Name.arel_table,
           observations: Observation.arel_table,
@@ -51,9 +51,9 @@ def tables
       end
 
       def add_joins
-        join_table(:images_observations, :image_id, attribute(:images, :id))
+        join_table(:observation_images, :image_id, attribute(:images, :id))
         join_table(:observations, :id,
-                   attribute(:images_observations, :observation_id))
+                   attribute(:observation_images, :observation_id))
         join_table(:names, :id, attribute(:observations, :name_id))
         join_table(:licenses, :id, attribute(:images, :license_id))
         join_table(:users, :id, attribute(:images, :user_id))

diff --git a/app/classes/report/darwin/gbif_images.rb b/app/classes/report/darwin/gbif_images.rb
@@ -8,7 +8,7 @@ class GbifImages < Report::CSV
       PROJECTION_ATTRIBUTES = [[:images, :id],
                                [:images, :when],
                                [:images, :copyright_holder],
-                               [:images_observations, :observation_id],
+                               [:observation_images, :observation_id],
                                [:observations, :updated_at],
                                [:observations, :when, "obs_when"],
                                [:observations, :lat],
@@ -70,7 +70,7 @@ def add_rank_condition(table, ranks)
       def tables
         @tables ||= {
           images: Image.arel_table,
-          images_observations: Arel::Table.new(:images_observations),
+          observation_images: Arel::Table.new(:observation_images),
           licenses: License.arel_table,
           locations: Location.arel_table,
           names: Name.arel_table,
@@ -80,9 +80,9 @@ def tables
       end
 
       def add_joins
-        join_table(:images_observations, :image_id, attribute(:images, :id))
+        join_table(:observation_images, :image_id, attribute(:images, :id))
         join_table(:observations, :id,
-                   attribute(:images_observations, :observation_id))
+                   attribute(:observation_images, :observation_id))
         join_table(:names, :id, attribute(:observations, :name_id))
         join_table(:locations, :id, attribute(:observations, :location_id))
         join_table(:users, :id, attribute(:images, :user_id))

diff --git a/test/controllers/observations_controller_test.rb b/test/controllers/observations_controller_test.rb
@@ -2997,7 +2997,7 @@ def test_download_observation_index
     assert_response(:success)
 
     post(
-      :download_observations,
+      :download,
       params: {
         q: query.id.alphabetize,
         format: "gbif",
@@ -3009,7 +3009,7 @@ def test_download_observation_index
     assert_response(:success)
 
     post(
-      :download_observations,
+      :download,
       params: {
         q: query.id.alphabetize,
         format: "eol",