Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update button should change status on modified white label #12577

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Update button should change status on modified white label #12577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/helpers/admin/enterprises_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ def build_enterprise_side_menu_items(
{ 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 },
Comment on lines -69 to 71
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have though it would break connected apps as well, but I can see it has it's own nested form so all good there.

]
end
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/admin/enterprises_helper_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
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

Expand Down
2 changes: 2 additions & 0 deletions spec/system/admin/enterprise_roles_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
create(:enterprise_role, user: u2, enterprise: e4)

# When I go to the roles page
scroll_to(:bottom)
click_link 'Users'
click_link 'Roles'

Expand Down Expand Up @@ -179,6 +180,7 @@
private

def navigate_to_enterprise_users
scroll_to(:bottom)
within ".side_menu" do
click_link "Users"
end
Expand Down
1 change: 1 addition & 0 deletions spec/system/admin/enterprises_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@
before do
login_as_admin
visit edit_admin_enterprise_path(distributor1)
scroll_to(:bottom)
within ".side_menu" do
click_link 'Users'
end
Expand Down
Loading