Merge branch 'master' of github.com:rubyforgood/diaper

Author: seanmarcia

Gemfile

@@ -49,15 +49,16 @@ gem "webpacker", "~> 3.5"
 
 group :development, :test do
   gem "awesome_print"
+  gem "fakeredis", require: "fakeredis/rspec"
   gem "guard-rspec"
   gem "pry-rails"
   gem "pry-nav"
+  gem 'rb-readline', '~> 0.5.3'
   gem "rspec-rails", "~> 3.8"
+  gem "rubocop"
   gem "terminal-notifier-guard"
   gem "terminal-notifier"
   gem "timecop"
-  gem "rubocop"
-  gem "fakeredis", require: "fakeredis/rspec"
 end
 
 group :development do

Gemfile.lock

@@ -326,6 +326,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
+    rb-readline (0.5.5)
     redis (4.1.0)
     ref (2.0.0)
     regexp_parser (1.3.0)
@@ -516,6 +517,7 @@ DEPENDENCIES
   rails (~> 5.2.2)
   rails-controller-testing
   rails-erd
+  rb-readline (~> 0.5.3)
   rspec-rails (~> 3.8)
   rubocop
   sass-rails

app/controllers/items_controller.rb

@@ -47,7 +47,12 @@ def update
   end
 
   def destroy
-    current_organization.items.find(params[:id]).destroy
+    item = current_organization.items.find(params[:id])
+    ActiveRecord::Base.transaction do
+      item.destroy
+    end
+
+    flash[:notice] = "#{item.name} has been removed."
     redirect_to items_path
   end
 

spec/system/item_system_spec.rb

@@ -0,0 +1,141 @@
+RSpec.describe "Item management", type: :system do
+  before do
+    sign_in(@user)
+  end
+  let!(:url_prefix) { "/#{@organization.to_param}" }
+  it "can create a new item as a user" do
+    visit url_prefix + "/items/new"
+    item_traits = attributes_for(:item)
+    fill_in "Name", with: item_traits[:name]
+    select BaseItem.last.name, from: "Base Item"
+    click_button "Save"
+
+    expect(page.find(".alert")).to have_content "added"
+  end
+
+  it "can create a new item with empty attributes as a user" do
+    visit url_prefix + "/items/new"
+    click_button "Save"
+
+    expect(page.find(".alert")).to have_content "didn't work"
+  end
+
+  it "can update an existing item as a user" do
+    item = create(:item)
+    visit url_prefix + "/items/#{item.id}/edit"
+    click_button "Save"
+
+    expect(page.find(".alert")).to have_content "updated"
+  end
+
+  it "can update an existing item with empty attributes as a user" do
+    item = create(:item)
+    visit url_prefix + "/items/#{item.id}/edit"
+    fill_in "Name", with: ""
+    click_button "Save"
+
+    expect(page.find(".alert")).to have_content "didn't work"
+  end
+
+  it "can filter the #index by base item as a user" do
+    Item.delete_all
+    create(:item, base_item: BaseItem.first)
+    create(:item, base_item: BaseItem.last)
+    visit url_prefix + "/items"
+    select BaseItem.first.name, from: "filters_by_base_item"
+    click_button "Filter"
+    within "#tbl_items" do
+      expect(page).to have_css("tbody tr", count: 1)
+    end
+  end
+
+  describe "destroying items" do
+    subject { create(:item, name: "DELETEME", organization: @user.organization) }
+    context "when an item has history" do
+      before do
+        create(:donation, :with_items, item: subject)
+      end
+      it "can be soft-deleted (deactivated) by the user" do
+        expect do
+          visit url_prefix + "/items"
+          expect(page).to have_content(subject.name)
+          within "tr[data-item-id='#{subject.id}']" do
+            accept_confirm do
+              click_on "Delete", match: :first
+            end
+          end
+          page.find(".alert-info")
+        end.to change { Item.unscoped.count }.by(0).and change { Item.count }.by(-1)
+        subject.reload
+        expect(subject).not_to be_active
+      end
+    end
+
+    context "when an item does not have history" do
+      it "can be fully deleted by the user" do
+        subject
+        expect do
+          visit url_prefix + "/items"
+          expect(page).to have_content(subject.name)
+          within "tr[data-item-id='#{subject.id}']" do
+            accept_confirm do
+              click_on "Delete", match: :first
+            end
+          end
+          page.find(".alert-info")
+        end.to change { Item.unscoped.count }.by(-1).and change { Item.count }.by(-1)
+        expect { subject.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+
+  describe "Item Table Tabs >" do
+    let(:item_pullups) { create(:item, name: "the most wonderful magical pullups that truly potty train", category: "Magic Toddlers") }
+    let(:item_tampons) { create(:item, name: "blackbeard's rugged tampons", category: "Menstrual Products") }
+    let(:storage_name) { "the poop catcher warehouse" }
+    let(:storage) { create(:storage_location, :with_items, item: item_pullups, item_quantity: num_pullups_in_donation, name: storage_name) }
+    let!(:aux_storage) { create(:storage_location, :with_items, item: item_pullups, item_quantity: num_pullups_second_donation, name: "a secret secondary location") }
+    let(:num_pullups_in_donation) { 666 }
+    let(:num_pullups_second_donation) { 1 }
+    let(:num_tampons_in_donation) { 42 }
+    let(:num_tampons_second_donation) { 17 }
+    let(:donation_tampons) { create(:donation, :with_items, storage_location: storage, item_quantity: num_tampons_in_donation, item: item_tampons) }
+    let(:donation_aux_tampons) { create(:donation, :with_items, storage_location: aux_storage, item_quantity: num_tampons_second_donation, item: item_tampons) }
+    before do
+      storage.increase_inventory(donation_tampons)
+      aux_storage.increase_inventory(donation_aux_tampons)
+      visit url_prefix + "/items"
+    end
+    # Consolidated these into one to reduce the setup/teardown
+    it "should display items in separate tabs", js: true do
+      tab_items_only_text = page.find("table#tbl_items", visible: true).text
+      expect(tab_items_only_text).not_to have_content "Quantity"
+      expect(tab_items_only_text).to have_content item_pullups.name
+      expect(tab_items_only_text).to have_content item_tampons.name
+
+      click_link "Items and Quantity" # href="#sectionB"
+      tab_items_and_quantity_text = page.find("table#tbl_items_quantity", visible: true).text
+      expect(tab_items_and_quantity_text).to have_content "Quantity"
+      expect(tab_items_and_quantity_text).not_to have_content storage_name
+      expect(tab_items_and_quantity_text).to have_content num_pullups_in_donation
+      expect(tab_items_and_quantity_text).to have_content num_pullups_second_donation
+      expect(tab_items_and_quantity_text).to have_content num_tampons_in_donation
+      expect(tab_items_and_quantity_text).to have_content num_tampons_second_donation
+      expect(tab_items_and_quantity_text).to have_content item_pullups.name
+      expect(tab_items_and_quantity_text).to have_content item_tampons.name
+
+      click_link "Items, Quantity, and Location" # href="#sectionC"
+      tab_items_quantity_location_text = page.find("table#tbl_items_location", visible: true).text
+      expect(tab_items_quantity_location_text).to have_content "Quantity"
+      expect(tab_items_quantity_location_text).to have_content storage_name
+      expect(tab_items_quantity_location_text).to have_content num_pullups_in_donation
+      expect(tab_items_quantity_location_text).to have_content num_pullups_second_donation
+      expect(tab_items_quantity_location_text).to have_content num_pullups_in_donation + num_pullups_second_donation
+      expect(tab_items_quantity_location_text).to have_content num_tampons_in_donation
+      expect(tab_items_quantity_location_text).to have_content num_tampons_second_donation
+      expect(tab_items_quantity_location_text).to have_content num_tampons_in_donation + num_tampons_second_donation
+      expect(tab_items_quantity_location_text).to have_content item_pullups.name
+      expect(tab_items_quantity_location_text).to have_content item_tampons.name
+    end
+  end
+end