From e68186b1ffaf9a748ee88995c437a38a92076721 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 11:37:49 +0100 Subject: [PATCH 1/9] Moves/updates _specific_time_spec into system --- .../admin/order_cycles/complex_creating_specific_time_spec.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/{features => system}/admin/order_cycles/complex_creating_specific_time_spec.rb (100%) diff --git a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb similarity index 100% rename from spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb rename to spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb From e877a7693b9b0f20c01bec099e4f1c74d5b45ffb Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 11:39:50 +0100 Subject: [PATCH 2/9] Moves/updates _exchange_same_enterprise into system --- .../order_cycles/complex_editing_exchange_same_enterprise_spec.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/{features => system}/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb (100%) diff --git a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb similarity index 100% rename from spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb rename to spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb From e643a548297aaf555625e8aadf56714e19717bbf Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 11:41:04 +0100 Subject: [PATCH 3/9] Moves/updates _exchange_same_enterprise into system --- .../admin/order_cycles/complex_creating_specific_time_spec.rb | 2 +- .../complex_editing_exchange_same_enterprise_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb index f0402c2493..a473b54416 100644 --- a/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb +++ b/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an administrator diff --git a/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb index 79f34c2f7a..f3fc018a86 100644 --- a/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb +++ b/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an administrator From 94174135069fc37d2ef2088d7f238ed9eec91157 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 11:43:04 +0100 Subject: [PATCH 4/9] Moves/updates _multiple_product_pages into system --- .../order_cycles/complex_editing_multiple_product_pages_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb (98%) diff --git a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb b/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb similarity index 98% rename from spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb rename to spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb index e782691d42..eb74531f19 100644 --- a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb +++ b/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an administrator From 117fcefae28259a0ddb734d59401899ae795402e Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 11:49:41 +0100 Subject: [PATCH 5/9] Moves/updates complex_editing_spec into system --- .../admin/order_cycles/complex_editing_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/order_cycles/complex_editing_spec.rb (99%) diff --git a/spec/features/admin/order_cycles/complex_editing_spec.rb b/spec/system/admin/order_cycles/complex_editing_spec.rb similarity index 99% rename from spec/features/admin/order_cycles/complex_editing_spec.rb rename to spec/system/admin/order_cycles/complex_editing_spec.rb index 58cf43b67a..d34962c4a5 100644 --- a/spec/features/admin/order_cycles/complex_editing_spec.rb +++ b/spec/system/admin/order_cycles/complex_editing_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an administrator From 0ad7fd35272cc9f15828fcb4a554c3ff330b5de7 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 11:52:43 +0100 Subject: [PATCH 6/9] Fixes string on assertion to pass as system spec --- spec/system/admin/order_cycles/complex_editing_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/system/admin/order_cycles/complex_editing_spec.rb b/spec/system/admin/order_cycles/complex_editing_spec.rb index d34962c4a5..4b2e587b35 100644 --- a/spec/system/admin/order_cycles/complex_editing_spec.rb +++ b/spec/system/admin/order_cycles/complex_editing_spec.rb @@ -27,7 +27,7 @@ describe ' expect(page.find('#order_cycle_name').value).to eq(oc.name) expect(page.find('#order_cycle_orders_open_at').value).to eq(oc.orders_open_at.strftime("%Y-%m-%d %H:%M")) expect(page.find('#order_cycle_orders_close_at').value).to eq(oc.orders_close_at.strftime("%Y-%m-%d %H:%M")) - expect(page).to have_content "COORDINATOR\n#{oc.coordinator.name}" + expect(page).to have_content "COORDINATOR #{oc.coordinator.name}" click_button 'Next' From 3a3af86e0295a5c742c9a6be06a650da2e2bdd9c Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 11:55:35 +0100 Subject: [PATCH 7/9] Moves/updates _updating_specific_time into system --- .../admin/order_cycles/complex_updating_specific_time_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/order_cycles/complex_updating_specific_time_spec.rb (99%) diff --git a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb b/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb similarity index 99% rename from spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb rename to spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb index 331e7995bf..3009bcd0f5 100644 --- a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb +++ b/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' xdescribe ' As an administrator From 1fceeef12afe2862abca2e6b31a2261c3467e20f Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Wed, 13 Oct 2021 12:04:59 +0100 Subject: [PATCH 8/9] Moves/updates list_spec.rb into system --- spec/{features => system}/admin/order_cycles/list_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/order_cycles/list_spec.rb (99%) diff --git a/spec/features/admin/order_cycles/list_spec.rb b/spec/system/admin/order_cycles/list_spec.rb similarity index 99% rename from spec/features/admin/order_cycles/list_spec.rb rename to spec/system/admin/order_cycles/list_spec.rb index 248ec8374a..c1766fec36 100644 --- a/spec/features/admin/order_cycles/list_spec.rb +++ b/spec/system/admin/order_cycles/list_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an administrator From 4509624ccf41a030b9f63630ec93fefca8541a75 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Thu, 14 Oct 2021 11:05:01 +0100 Subject: [PATCH 9/9] Moves/updates simple_spec.rb into system --- spec/{features => system}/admin/order_cycles/simple_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/order_cycles/simple_spec.rb (99%) diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/system/admin/order_cycles/simple_spec.rb similarity index 99% rename from spec/features/admin/order_cycles/simple_spec.rb rename to spec/system/admin/order_cycles/simple_spec.rb index 0149b06b08..22a97ca84e 100644 --- a/spec/features/admin/order_cycles/simple_spec.rb +++ b/spec/system/admin/order_cycles/simple_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an administrator