fix associations for status + fix test

one-m1nd · Mar 4, 2024 · b6deaeb · b6deaeb
1 parent bdd51e9
commit b6deaeb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/app/controllers/plants_controller.rb b/app/controllers/plants_controller.rb
@@ -3,7 +3,7 @@ class PlantsController < ApplicationController
 
   # GET /plants or /plants.json
   def index
-    @plants = Plant.all.includes(:genus, :family).sort_by(&:name)
+    @plants = Plant.all.includes(:genus, :family, :status).sort_by(&:name)
   end
 
   # GET /plants/1 or /plants/1.json

diff --git a/app/models/plant.rb b/app/models/plant.rb
@@ -1,11 +1,7 @@
 class Plant < ApplicationRecord
   belongs_to :family
   belongs_to :genus
-  has_one :status
-
-  def status
-    Status.find(status_id)
-  end
+  belongs_to :status
 
   # @return [Hash]
   def trefle_data

diff --git a/test/controllers/plants_controller_test.rb b/test/controllers/plants_controller_test.rb
@@ -17,7 +17,7 @@ class PlantsControllerTest < ActionDispatch::IntegrationTest
 
   test "should create plant" do
     assert_difference("Plant.count") do
-      post plants_url, params: { plant: { name: 'PlantThree', family_id: 1, genus_id: 1 } }
+      post plants_url, params: { plant: { name: 'PlantThree', family_id: 1, genus_id: 1, status_id: 1 } }
     end
 
     assert_redirected_to plant_url(Plant.last)