Update controller tests for refactored API and 2-tier roles

- ItemTagsControllerTest: switch payloads from queue_number to name;
  drop invalid-format and already_completed cases; rename reset to idle;
  cover the duplicate-name-allowed case
- ShopsControllerTest: drop the reset action test (action removed)
- BaseControllerTest: rewire the validation-error case to use blank name
  instead of duplicate queue_number
- Accounts/AccountsInvitations/AccountsShopkeepers/Permissions/
  RegistrationsControllerTest: rename old-tier role refs to member

Author: dadachi

test/controllers/api/v1/shopkeeper/accounts/accounts_invitations_controller_test.rb

@@ -11,7 +11,7 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
       name: "Invited User",
       email: "invited@example.com",
       invited_by: @shopkeeper,
-      junior_member: true
+      member: true
     )
   end
 
@@ -20,7 +20,7 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
       account: @account,
       name: "Another User",
       email: "another@example.com",
-      junior_member: true
+      member: true
     )
 
     get api_v1_shopkeeper_account_accounts_invitations_url(@account),
@@ -45,7 +45,7 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
           accounts_invitation: {
             name: "New User",
             email: "newuser@example.com",
-            junior_member: true
+            member: true
           }
         },
         headers: @shopkeeper.create_new_auth_token
@@ -62,7 +62,7 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
           accounts_invitation: {
             name: "",
             email: "invalid@example.com",
-            junior_member: true
+            member: true
           }
         },
         headers: @shopkeeper.create_new_auth_token
@@ -78,15 +78,15 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
     AccountsShopkeeper.create!(
       account: @account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     post api_v1_shopkeeper_account_accounts_invitations_url(@account),
       params: {
         accounts_invitation: {
           name: "New User",
           email: "newuser@example.com",
-          junior_member: true
+          member: true
         }
       },
       headers: other_shopkeeper.create_new_auth_token
@@ -99,15 +99,15 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
       params: {
         accounts_invitation: {
           name: "Updated Name",
-          senior_member: true,
-          junior_member: false
+          admin: true,
+          member: false
         }
       },
       headers: @shopkeeper.create_new_auth_token
 
     assert_response :success
     assert_equal "Updated Name", @invitation.reload.name
-    assert @invitation.senior_member?
+    assert @invitation.admin?
   end
 
   test "update returns error for invalid data" do
@@ -129,7 +129,7 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
     AccountsShopkeeper.create!(
       account: @account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     patch api_v1_shopkeeper_account_accounts_invitation_url(@account, @invitation.token),
@@ -153,7 +153,7 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
     AccountsShopkeeper.create!(
       account: @account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     delete api_v1_shopkeeper_account_accounts_invitation_url(@account, @invitation.token),
@@ -191,7 +191,7 @@ class Api::V1::Shopkeeper::Accounts::AccountsInvitationsControllerTest < ActionD
     AccountsShopkeeper.create!(
       account: @account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     post resend_api_v1_shopkeeper_account_accounts_invitation_path(@account, @invitation.token),

test/controllers/api/v1/shopkeeper/accounts_controller_test.rb

@@ -61,7 +61,7 @@ class Api::V1::Shopkeeper::AccountsControllerTest < ActionDispatch::IntegrationT
     AccountsShopkeeper.create!(
       account: @team_account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     patch api_v1_shopkeeper_account_url(@team_account),

test/controllers/api/v1/shopkeeper/accounts_invitations_controller_test.rb

@@ -9,7 +9,7 @@ class Api::V1::Shopkeeper::AccountsInvitationsControllerTest < ActionDispatch::I
       account: @account,
       name: "Invited User",
       email: "invited@example.com",
-      junior_member: true
+      member: true
     )
   end
 
@@ -52,7 +52,7 @@ class Api::V1::Shopkeeper::AccountsInvitationsControllerTest < ActionDispatch::I
     AccountsShopkeeper.create!(
       account: @account,
       shopkeeper: shopkeepers(:two),
-      junior_member: true
+      member: true
     )
 
     patch api_v1_shopkeeper_accounts_invitation_url(@invitation.token),

test/controllers/api/v1/shopkeeper/accounts_shopkeepers_controller_test.rb

@@ -28,7 +28,7 @@ class Api::V1::Shopkeeper::AccountsShopkeepersControllerTest < ActionDispatch::I
     AccountsShopkeeper.create!(
       account: @team_account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     get api_v1_shopkeeper_account_accounts_shopkeepers_url(@team_account),
@@ -62,31 +62,31 @@ class Api::V1::Shopkeeper::AccountsShopkeepersControllerTest < ActionDispatch::I
     accounts_shopkeeper = AccountsShopkeeper.create!(
       account: @team_account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     patch api_v1_shopkeeper_account_accounts_shopkeeper_url(@team_account, accounts_shopkeeper),
-      params: {accounts_shopkeeper: {senior_member: true, junior_member: false}},
+      params: {accounts_shopkeeper: {admin: true, member: false}},
       headers: @shopkeeper.create_new_auth_token
 
     assert_response :success
-    assert accounts_shopkeeper.reload.senior_member?
-    assert_not accounts_shopkeeper.junior_member?
+    assert accounts_shopkeeper.reload.admin?
+    assert_not accounts_shopkeeper.member?
   end
 
   test "update returns error for personal account" do
     accounts_shopkeeper = @account.accounts_shopkeepers.first
 
     patch api_v1_shopkeeper_account_accounts_shopkeeper_url(@account, accounts_shopkeeper),
-      params: {accounts_shopkeeper: {admin: false, junior_member: true}},
+      params: {accounts_shopkeeper: {admin: false, member: true}},
       headers: @shopkeeper.create_new_auth_token
 
     assert_response :unprocessable_entity
   end
 
   test "update returns validation error when owner removes own admin" do
     patch api_v1_shopkeeper_account_accounts_shopkeeper_url(@team_account, @team_accounts_shopkeeper),
-      params: {accounts_shopkeeper: {admin: false, junior_member: true}},
+      params: {accounts_shopkeeper: {admin: false, member: true}},
       headers: @shopkeeper.create_new_auth_token
 
     assert_response :unprocessable_entity
@@ -99,11 +99,11 @@ class Api::V1::Shopkeeper::AccountsShopkeepersControllerTest < ActionDispatch::I
     AccountsShopkeeper.create!(
       account: @team_account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     patch api_v1_shopkeeper_account_accounts_shopkeeper_url(@team_account, @team_accounts_shopkeeper),
-      params: {accounts_shopkeeper: {senior_member: true}},
+      params: {accounts_shopkeeper: {member: true}},
       headers: other_shopkeeper.create_new_auth_token
 
     assert_response :unauthorized
@@ -114,7 +114,7 @@ class Api::V1::Shopkeeper::AccountsShopkeepersControllerTest < ActionDispatch::I
     accounts_shopkeeper = AccountsShopkeeper.create!(
       account: @team_account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     assert_difference "AccountsShopkeeper.count", -1 do
@@ -148,7 +148,7 @@ class Api::V1::Shopkeeper::AccountsShopkeepersControllerTest < ActionDispatch::I
     accounts_shopkeeper = AccountsShopkeeper.create!(
       account: @team_account,
       shopkeeper: other_shopkeeper,
-      junior_member: true
+      member: true
     )
 
     delete api_v1_shopkeeper_account_accounts_shopkeeper_url(@team_account, accounts_shopkeeper),

test/controllers/api/v1/shopkeeper/base_controller_test.rb

@@ -9,11 +9,9 @@ def setup
   end
 
   test "render_validation_error returns 422 with error messages" do
-    item_tag = @shop.item_tags.first
-
-    # Try to create a duplicate queue_number to trigger validation error
+    # Try to create an item_tag with a blank name to trigger validation error
     post api_v1_shopkeeper_shop_item_tags_url(@shop),
-      params: {item_tag: {queue_number: item_tag.queue_number}},
+      params: {item_tag: {name: ""}},
       headers: @shopkeeper.create_new_auth_token
 
     assert_response :unprocessable_entity

test/controllers/api/v1/shopkeeper/item_tags_controller_test.rb

@@ -13,7 +13,7 @@ class Api::V1::Shopkeeper::ItemTagsControllerTest < ActionDispatch::IntegrationT
   test "index returns item_tags" do
     get api_v1_shopkeeper_shop_item_tags_url(@shop), headers: @shopkeeper.create_new_auth_token
     assert_response :success
-    assert_includes response.parsed_body["data"].map { |t| t["attributes"]["queue_number"] }, @item_tag.queue_number
+    assert_includes response.parsed_body["data"].map { |t| t["attributes"]["name"] }, @item_tag.name
   end
 
   test "index returns pagination meta" do
@@ -64,7 +64,7 @@ class Api::V1::Shopkeeper::ItemTagsControllerTest < ActionDispatch::IntegrationT
   test "show returns an item_tag detail" do
     get api_v1_shopkeeper_item_tag_url(@item_tag), headers: @shopkeeper.create_new_auth_token
     assert_response :success
-    assert_equal response.parsed_body["data"]["attributes"]["queue_number"], @item_tag.queue_number
+    assert_equal response.parsed_body["data"]["attributes"]["name"], @item_tag.name
   end
 
   test "show returns 404 for nonexistent item_tag" do
@@ -80,18 +80,18 @@ class Api::V1::Shopkeeper::ItemTagsControllerTest < ActionDispatch::IntegrationT
   test "create creates a new item_tag" do
     assert_difference "ItemTag.count", 1 do
       post api_v1_shopkeeper_shop_item_tags_url(@shop),
-        params: {item_tag: {queue_number: "Z99"}},
+        params: {item_tag: {name: "Buy milk"}},
         headers: @shopkeeper.create_new_auth_token
     end
 
     assert_response :created
-    assert_equal "Z99", response.parsed_body["data"]["attributes"]["queue_number"]
+    assert_equal "Buy milk", response.parsed_body["data"]["attributes"]["name"]
   end
 
-  test "create returns validation error with blank queue_number" do
+  test "create returns validation error with blank name" do
     assert_no_difference "ItemTag.count" do
       post api_v1_shopkeeper_shop_item_tags_url(@shop),
-        params: {item_tag: {queue_number: ""}},
+        params: {item_tag: {name: ""}},
         headers: @shopkeeper.create_new_auth_token
     end
 
@@ -100,41 +100,29 @@ class Api::V1::Shopkeeper::ItemTagsControllerTest < ActionDispatch::IntegrationT
     assert response.parsed_body["error_message"].present?
   end
 
-  test "create returns validation error with duplicate queue_number" do
-    assert_no_difference "ItemTag.count" do
-      post api_v1_shopkeeper_shop_item_tags_url(@shop),
-        params: {item_tag: {queue_number: @item_tag.queue_number}},
-        headers: @shopkeeper.create_new_auth_token
-    end
-
-    assert_response :unprocessable_entity
-    assert_equal 422, response.parsed_body["code"]
-  end
-
-  test "create returns validation error with invalid queue_number format" do
-    assert_no_difference "ItemTag.count" do
+  test "create allows duplicate name within the same shop" do
+    assert_difference "ItemTag.count", 1 do
       post api_v1_shopkeeper_shop_item_tags_url(@shop),
-        params: {item_tag: {queue_number: "A"}},
+        params: {item_tag: {name: @item_tag.name}},
         headers: @shopkeeper.create_new_auth_token
     end
 
-    assert_response :unprocessable_entity
-    assert_equal 422, response.parsed_body["code"]
+    assert_response :created
   end
 
   # update
-  test "update succeeds with valid queue_number" do
+  test "update succeeds with valid name" do
     patch api_v1_shopkeeper_item_tag_url(@item_tag),
-      params: {item_tag: {queue_number: "X99"}},
+      params: {item_tag: {name: "Buy bread"}},
       headers: @shopkeeper.create_new_auth_token
 
     assert_response :success
-    assert_equal "X99", @item_tag.reload.queue_number
+    assert_equal "Buy bread", @item_tag.reload.name
   end
 
-  test "update returns validation error with invalid queue_number" do
+  test "update returns validation error with blank name" do
     patch api_v1_shopkeeper_item_tag_url(@item_tag),
-      params: {item_tag: {queue_number: "A"}},
+      params: {item_tag: {name: ""}},
       headers: @shopkeeper.create_new_auth_token
 
     assert_response :unprocessable_entity
@@ -167,21 +155,21 @@ class Api::V1::Shopkeeper::ItemTagsControllerTest < ActionDispatch::IntegrationT
     assert @item_tag.reload.completed?
   end
 
-  test "complete sets already_completed when already completed" do
+  test "complete is a no-op when item_tag is already completed" do
     @item_tag.complete!
     assert @item_tag.reload.completed?
 
     patch complete_api_v1_shopkeeper_item_tag_url(@item_tag), headers: @shopkeeper.create_new_auth_token
     assert_response :success
-    assert @item_tag.reload.already_completed
+    assert @item_tag.reload.completed?
   end
 
-  # reset
-  test "reset resets an item_tag" do
+  # idle
+  test "idle resets an item_tag" do
     @item_tag.complete!
     assert @item_tag.reload.completed?
 
-    patch reset_api_v1_shopkeeper_item_tag_url(@item_tag), headers: @shopkeeper.create_new_auth_token
+    patch idle_api_v1_shopkeeper_item_tag_url(@item_tag), headers: @shopkeeper.create_new_auth_token
     assert_response :success
     assert @item_tag.reload.idled?
   end

test/controllers/api/v1/shopkeeper/shops_controller_test.rb

@@ -81,16 +81,4 @@ class Api::V1::Shopkeeper::ShopsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
-  # reset
-  test "reset resets all item_tags in shop" do
-    item_tag = @shop.item_tags.first
-    item_tag.complete!
-    assert item_tag.reload.completed?
-
-    delete reset_api_v1_shopkeeper_shop_url(@shop),
-      headers: @shopkeeper.create_new_auth_token
-
-    assert_response :success
-    assert item_tag.reload.idled?
-  end
 end

test/controllers/shopkeeper_auth/registrations_controller_test.rb

@@ -36,7 +36,7 @@ class ShopkeeperAuth::RegistrationsControllerTest < ActionDispatch::IntegrationT
 
     ActsAsTenant.with_tenant(account) do
       shop = account.shops.create!(name: "Test Shop", created_by: shopkeeper)
-      shop.item_tags.create!(queue_number: "A1", account: account, completed_by: shopkeeper)
+      shop.item_tags.create!(name: "Buy milk", account: account, completed_by: shopkeeper)
     end
 
     assert_difference "Shopkeeper.count", -1 do