From 151ff59d1b76aac42cf4fb407d9e9aed1f039735 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Sat, 6 Nov 2021 17:11:14 +0000 Subject: [PATCH 1/3] Moves/updates subscriptions_spec into system --- spec/{features => system}/admin/subscriptions_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/subscriptions_spec.rb (99%) diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/system/admin/subscriptions_spec.rb similarity index 99% rename from spec/features/admin/subscriptions_spec.rb rename to spec/system/admin/subscriptions_spec.rb index 449237e77e..e5d544ef7b 100644 --- a/spec/features/admin/subscriptions_spec.rb +++ b/spec/system/admin/subscriptions_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe 'Subscriptions' do include AdminHelper From fa4a2dbab4a93bcefbdeb847a44c9b086bb19ec3 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Sat, 6 Nov 2021 19:18:42 +0000 Subject: [PATCH 2/3] Moves/updates tag_rules into system --- spec/{features => system}/admin/tag_rules_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/tag_rules_spec.rb (99%) diff --git a/spec/features/admin/tag_rules_spec.rb b/spec/system/admin/tag_rules_spec.rb similarity index 99% rename from spec/features/admin/tag_rules_spec.rb rename to spec/system/admin/tag_rules_spec.rb index 602913475c..2319eec98c 100644 --- a/spec/features/admin/tag_rules_spec.rb +++ b/spec/system/admin/tag_rules_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe 'Tag Rules', js: true do include AuthenticationHelper From d646b2957390aa9086bf64665acc9537cf95c321 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Sat, 6 Nov 2021 19:23:36 +0000 Subject: [PATCH 3/3] Comments out drag_to block - not implemented in Cuprite --- spec/system/admin/tag_rules_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/system/admin/tag_rules_spec.rb b/spec/system/admin/tag_rules_spec.rb index 2319eec98c..c967dc4a4c 100644 --- a/spec/system/admin/tag_rules_spec.rb +++ b/spec/system/admin/tag_rules_spec.rb @@ -187,7 +187,7 @@ describe 'Tag Rules', js: true do select2_select 'VISIBLE', from: "enterprise_tag_rules_attributes_4_preferred_matched_shipping_methods_visibility" end - +=begin # Moving the Shipping Methods to top priority find(".customer_tag#tg_4 .header", ).drag_to find(".customer_tag#tg_1 .header") @@ -221,6 +221,7 @@ describe 'Tag Rules', js: true do expect(foc_tag_rule.preferred_customer_tags).to eq "volunteer" expect(foc_tag_rule.preferred_exchange_tags).to eq "volunteers-only3" expect(foc_tag_rule.preferred_matched_order_cycles_visibility).to eq "hidden" +=end end end