Superadmin Partners View (4682) & Category Dropdown Error (4674)

app/controllers/admin/partners_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PartnersController < AdminController
   def index
-    @partners = Partner.all.includes(:organization)
+    @partners = Partner.all.includes(:organization).order("LOWER(name)")
   end
 
   def show

app/controllers/items_controller.rb

@@ -50,7 +50,8 @@ def create
       @base_items = BaseItem.without_kit.alphabetized
       # Define a @item to be used in the `new` action to be rendered with
       # the provided parameters. This is required to render the page again
-      # with the error + the invalid parameters
+      # with the error + the invalid parameters.
+      @item_categories = current_organization.item_categories.order('name ASC') # Load categories here
       @item = current_organization.items.new(item_params)
       flash[:error] = result.error.record.errors.full_messages.to_sentence
       render action: :new

spec/controllers/admin/partners_controller_spec.rb

@@ -0,0 +1,48 @@
+RSpec.describe Admin::PartnersController, type: :controller do
+  let(:organization) { create(:organization) }
+
+  # Use the super_admin instead of organization_admin
+  let(:super_admin) { create(:super_admin) }
+
+  # Ensure partners are created before the test
+  let!(:partner2) { create(:partner, name: "Bravo", organization: organization) }
+  let!(:partner1) { create(:partner, name: "alpha", organization: organization) }
+  let!(:partner3) { create(:partner, name: "Zeus", organization: organization) }
+
+  let(:default_params) do
+    {organization_id: organization.id}
+  end
+
+  context "When logged in as a super admin" do
+    before do
+      sign_in(super_admin)  # Sign in as the super_admin
+    end
+
+    describe "GET #index" do
+      it "returns http success" do
+        get :index
+        expect(response).to be_successful
+      end
+
+      it "assigns partners ordered by name (case-insensitive)" do
+        get :index
+        expect(assigns(:partners)).to eq([partner1, partner2, partner3].sort_by { |p| p.name.downcase })
+      end
+    end
+  end
+
+  context "When logged in as a non-admin user" do
+    let(:user) { create(:user) }
+
+    before do
+      sign_in(user)
+    end
+
+    describe "GET #index" do
+      it "redirects to login or unauthorized page" do
+        get :index
+        expect(response).to be_redirect
+      end
+    end
+  end
+end

spec/controllers/admins_controller_spec.rb

@@ -1,11 +1,9 @@
-=begin
-
-RSpec.describe AdminsController, type: :controller do
+RSpec.describe AdminController, type: :controller do
   let(:organization) { create(:organization) }
   let(:organization_admin) { create(:organization_admin, organization: organization) }
 
   let(:default_params) do
-    { organization_id: organization.id }
+    {organization_id: organization.id}
   end
 
   context "When logged in as an organization admin" do
@@ -22,7 +20,7 @@
 
     describe "POST #create" do
       it "redirects" do
-        post :create, params: { organization: attributes_for(:organization) }
+        post :create, params: {organization: attributes_for(:organization)}
         expect(response).to be_redirect
       end
     end
@@ -36,28 +34,28 @@
 
     describe "GET #show" do
       it "returns http success" do
-        get :show, params: { id: organization.id }
+        get :show, params: {id: organization.id}
         expect(response).to be_successful
       end
     end
 
     describe "GET #edit" do
       it "returns http success" do
-        get :edit, params: { id: organization.id }
+        get :edit, params: {id: organization.id}
         expect(response).to be_successful
       end
     end
 
     describe "PUT #update" do
       it "redirect" do
-        put :update, params: { id: organization.id, organization: { name: "Foo" } }
+        put :update, params: {id: organization.id, organization: {name: "Foo"}}
         expect(response).to be_redirect
       end
     end
 
     describe "DELETE #destroy" do
       it "redirects" do
-        delete :destroy, params: { id: organization.id }
+        delete :destroy, params: {id: organization.id}
         expect(response).to be_redirect
       end
     end
@@ -77,7 +75,7 @@
 
     describe "POST #create" do
       it "redirects" do
-        post :create, params: { organization: attributes_for(:organization) }
+        post :create, params: {organization: attributes_for(:organization)}
         expect(response).to be_redirect
       end
     end
@@ -91,17 +89,16 @@
 
     describe "GET #edit" do
       it "redirects" do
-        get :edit, params: { id: organization.id }
+        get :edit, params: {id: organization.id}
         expect(response).to be_redirect
       end
     end
 
     describe "PUT #update" do
       it "redirects" do
-        put :update, params: { id: organization.id, organization: { name: "Foo" } }
+        put :update, params: {id: organization.id, organization: {name: "Foo"}}
         expect(response).to be_redirect
       end
     end
   end
-end
-=end
+end

spec/requests/items_requests_spec.rb

@@ -111,6 +111,7 @@
 
     describe "CREATE #create" do
       let!(:existing_item) { create(:item, organization: organization, name: "Really Good Item") }
+      let!(:item_category) { create(:item_category, organization: organization, name: "Test Category") }
 
       describe "with an already existing item name" do
         let(:item_params) do
@@ -134,6 +135,49 @@
       end
     end
 
+    describe "with invalid parameters" do
+      let(:invalid_item_params) do
+        {
+          item: {
+            name: "",  # Invalid name
+            partner_key: create(:base_item).partner_key,
+            value_in_cents: -100,  # Invalid value
+            package_size: nil,
+            distribution_quantity: nil
+          }
+        }
+      end
+
+      let(:categories) do
+        [
+          FactoryBot.create(:item_category, name: 'Apples', organization: organization),
+          FactoryBot.create(:item_category, name: 'Umbrella', organization: organization),
+          FactoryBot.create(:item_category, name: 'Bananas', organization: organization)
+        ]
+      end
+
+      before do
+        categories  # Ensure categories are created before the request
+      end
+
+      it "loads and displays the item categories when rendering new" do
+
+        # Attempt to create an item with invalid parameters
+        post items_path, params: invalid_item_params
+
+        # Expect to render the new template
+        expect(response).to render_template(:new)
+
+        # Ensure the item categories are assigned in the controller
+        expect(assigns(:item_categories)).to eq(organization.item_categories.order('name ASC'))
+
+        # Verify the categories are included in the response body
+        categories.each do |category|
+          expect(response.body).to include("<option value=\"#{category.id}\">#{category.name}</option>")
+        end
+      end
+    end
+
     describe 'GET #index' do
       let(:storage_location) { create(:storage_location, organization: organization) }
       let!(:item) { create(:item, organization: organization, name: "ACTIVEITEM") }