more fixes

Author: dorner

app/controllers/kits_controller.rb

@@ -16,7 +16,7 @@ def new
     load_form_collections
 
     @kit = current_organization.kits.new
-    @kit.kit_item = current_organization.items.new
+    @kit.kit_item = KitItem.new(organization: current_organization)
     @kit.kit_item.line_items.build
   end
 
@@ -36,7 +36,8 @@ def create
       kit_only_params = kit_params.except(:line_items_attributes)
       @kit = Kit.new(kit_only_params)
       load_form_collections
-      @kit.kit_item ||= current_organization.items.new(kit_params.slice(:line_items_attributes))
+      @kit.kit_item ||= KitItem.new(organization: current_organization,
+                                    **kit_params.slice(:line_items_attributes))
       @kit.kit_item.line_items.build if @kit.kit_item.line_items.empty?
 
       render :new
@@ -96,7 +97,7 @@ def kit_params
       :visible_to_partners,
       :value_in_dollars
     )
-    item_params = params.require(:item)
+    item_params = params.require(:kit_item)
       .permit(line_items_attributes: [:item_id, :quantity, :_destroy])
     kit_params.to_h.merge(item_params.to_h)
   end

app/models/kit.rb

@@ -42,7 +42,7 @@ def deactivate
   # or deallocated, we are changing inventory for inactive items (which we don't allow).
   # @return [Boolean]
   def can_reactivate?
-    kit_item.line_items.joins(:kit_item).where(items: { active: false }).none?
+    kit_item.line_items.joins(:item).where(items: { active: false }).none?
   end
 
   def reactivate

app/views/items/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for @item, remote: request.xhr?, html: {class: 'form-horizontal'} do |f| %>
+<%= simple_form_for @item.becomes(Item), remote: request.xhr?, html: {class: 'form-horizontal'} do |f| %>
   <section class="content">
     <div class="container-fluid">
       <div class="row">

spec/requests/kit_requests_spec.rb

@@ -83,7 +83,7 @@
       it "cannot reactivate if it has an inactive item" do
         kit.deactivate
         expect(kit).not_to be_active
-        kit.kit_item.line_items.first.kit_item.update!(active: false)
+        kit.kit_item.line_items.first.item.update!(active: false)
 
         put reactivate_kit_url(kit)
         expect(kit.reload).not_to be_active

spec/system/kit_system_spec.rb

@@ -42,8 +42,8 @@
 
     item = Item.last
     quantity_per_kit = 5
-    select item.name, from: "item_line_items_attributes_0_item_id"
-    find(:css, '#item_line_items_attributes_0_quantity').set(quantity_per_kit)
+    select item.name, from: "kit_item_line_items_attributes_0_item_id"
+    find(:css, '#kit_item_line_items_attributes_0_quantity').set(quantity_per_kit)
 
     click_button "Save"
 
@@ -73,7 +73,7 @@
 
     expect(page).to have_content("Barcode Added to Inventory")
     # Check that item details have been filled in via javascript
-    expect(page).to have_field("item_line_items_attributes_0_quantity", with: quantity)
+    expect(page).to have_field("kit_item_line_items_attributes_0_quantity", with: quantity)
     # Check that new field has been added via javascript
     expect(page).to have_css(".line_item_section", count: 2)
   end
@@ -216,8 +216,8 @@
 
       item = Item.last
       quantity_per_kit = 5
-      select item.name, from: "item_line_items_attributes_0_item_id"
-      find(:css, '#item_line_items_attributes_0_quantity').set(quantity_per_kit)
+      select item.name, from: "kit_item_line_items_attributes_0_item_id"
+      find(:css, '#kit_item_line_items_attributes_0_quantity').set(quantity_per_kit)
 
       click_button "Save"