diff --git a/config/locales/en.yml b/config/locales/en.yml index 91910ef186..8a151dd959 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1048,7 +1048,7 @@ en: preferred_product_selection_from_coordinator_inventory_only_here: Coordinator's Inventory Only preferred_product_selection_from_coordinator_inventory_only_all: All Available Products save_reload: Save and Reload Page - advanced_settings_toggle: + order_cycle_top_buttons: advanced_settings: "Advanced Settings" coordinator_fees: add: Add coordinator fee diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb index e702f98cd5..fb0a7b8d6e 100644 --- a/spec/features/admin/enterprise_groups_spec.rb +++ b/spec/features/admin/enterprise_groups_spec.rb @@ -119,7 +119,5 @@ feature ' click_link 'Groups' expect(page).to have_content 'My Group' end - - xit "should show me only enterprises I manage when creating a new enterprise group" end end diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb index fb1c772b4b..ef710d59e3 100644 --- a/spec/features/admin/overview_spec.rb +++ b/spec/features/admin/overview_spec.rb @@ -43,7 +43,7 @@ feature ' end end - pending "when user is a profile only" do + context "when user is a profile only" do before do d1.sells = "none" d1.save! @@ -51,7 +51,7 @@ feature ' it "does not show a products item" do visit '/admin' - page.should_not have_selector "#products" + expect(page).to have_no_selector "#products" end end end diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb index 691483305c..bc716a0c0e 100644 --- a/spec/features/admin/shipping_methods_spec.rb +++ b/spec/features/admin/shipping_methods_spec.rb @@ -45,8 +45,6 @@ feature 'shipping methods' do expect(sm.distributors).to match_array [distributor1, distributor2] end - it "at checkout, user can only see shipping methods for their current distributor (checkout spec)" - scenario "deleting a shipping method" do visit_delete spree.admin_shipping_method_path(@shipping_method)