From d83ff4ef3340a0c01204b7badaa561c4afbc0b29 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 11 Dec 2014 11:16:07 +1100 Subject: [PATCH] Remove short wait, show variant overrides tab in admin --- .../add_variant_overrides_tab.html.haml.deface | 3 +-- spec/features/admin/variant_overrides_spec.rb | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface b/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface index 1c61c06a0c..0f4dde1798 100644 --- a/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface +++ b/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface @@ -1,4 +1,3 @@ / insert_bottom "[data-hook='admin_product_sub_tabs']" --# Commented out until this feature is ready --#= tab :overrides, url: main_app.admin_variant_overrides_path, match_path: '/variant_overrides' += tab :overrides, url: main_app.admin_variant_overrides_path, match_path: '/variant_overrides' diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb index 98d2251a31..3cacbd7490 100644 --- a/spec/features/admin/variant_overrides_spec.rb +++ b/spec/features/admin/variant_overrides_spec.rb @@ -9,8 +9,6 @@ feature %q{ include AuthenticationWorkflow include WebHelper - use_short_wait - let!(:hub) { create(:distributor_enterprise) } let!(:hub2) { create(:distributor_enterprise) } let!(:producer) { create(:supplier_enterprise) }