mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Update button should change status on modified white label
- swap position between users & white label so that user's inner form - does not interfere with white_label own position in outer form - modified spec so that lowermost user is clickable
This commit is contained in:
@@ -66,8 +66,8 @@ module Admin
|
||||
{ name: 'inventory_settings', icon_class: "icon-list-ol", show: is_shop },
|
||||
{ name: 'tag_rules', icon_class: "icon-random", show: is_shop },
|
||||
{ name: 'shop_preferences', icon_class: "icon-shopping-cart", show: is_shop },
|
||||
{ name: 'users', icon_class: "icon-user", show: true },
|
||||
{ name: 'white_label', icon_class: "icon-leaf", show: true },
|
||||
{ name: 'users', icon_class: "icon-user", show: true },
|
||||
{ name: 'connected_apps', icon_class: "icon-puzzle-piece", show: show_connected_apps },
|
||||
]
|
||||
end
|
||||
|
||||
@@ -23,7 +23,7 @@ RSpec.describe Admin::EnterprisesHelper, type: :helper do
|
||||
expect(visible_items.pluck(:name)).to eq %w[
|
||||
primary_details address contact social about business_details images
|
||||
vouchers enterprise_permissions inventory_settings tag_rules
|
||||
shop_preferences users white_label
|
||||
shop_preferences white_label users
|
||||
]
|
||||
end
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ create(:enterprise)
|
||||
create(:enterprise_role, user: u2, enterprise: e4)
|
||||
|
||||
# When I go to the roles page
|
||||
scroll_to(:bottom)
|
||||
click_link 'Users'
|
||||
click_link 'Roles'
|
||||
|
||||
@@ -179,6 +180,7 @@ create(:enterprise)
|
||||
private
|
||||
|
||||
def navigate_to_enterprise_users
|
||||
scroll_to(:bottom)
|
||||
within ".side_menu" do
|
||||
click_link "Users"
|
||||
end
|
||||
|
||||
@@ -569,6 +569,7 @@ RSpec.describe '
|
||||
before do
|
||||
login_as_admin
|
||||
visit edit_admin_enterprise_path(distributor1)
|
||||
scroll_to(:bottom)
|
||||
within ".side_menu" do
|
||||
click_link 'Users'
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user