From 7e0d24c784158c8fcc3a3eaa62ea055e1544cafa Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 8 Nov 2021 16:33:25 +0000 Subject: [PATCH 1/4] Moves/updates tax_settings into system --- spec/{features => system}/admin/tax_settings_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/tax_settings_spec.rb (97%) diff --git a/spec/features/admin/tax_settings_spec.rb b/spec/system/admin/tax_settings_spec.rb similarity index 97% rename from spec/features/admin/tax_settings_spec.rb rename to spec/system/admin/tax_settings_spec.rb index cccf48f486..cef6d8725d 100644 --- a/spec/features/admin/tax_settings_spec.rb +++ b/spec/system/admin/tax_settings_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe 'Account and Billing Settings' do include AuthenticationHelper From 05393351f6cf2a0c0f055a92e097ad5d429f4870 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 8 Nov 2021 16:45:32 +0000 Subject: [PATCH 2/4] Moves/updates unit_price_spec into system --- spec/{features => system}/admin/unit_price_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/unit_price_spec.rb (99%) diff --git a/spec/features/admin/unit_price_spec.rb b/spec/system/admin/unit_price_spec.rb similarity index 99% rename from spec/features/admin/unit_price_spec.rb rename to spec/system/admin/unit_price_spec.rb index dfff047291..8cbb058faf 100644 --- a/spec/features/admin/unit_price_spec.rb +++ b/spec/system/admin/unit_price_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an admin From 42992e63a5373ab1739037c505d3914ccf08a23e Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 8 Nov 2021 16:46:41 +0000 Subject: [PATCH 3/4] Moves/updates users_spec into system --- spec/{features => system}/admin/users_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spec/{features => system}/admin/users_spec.rb (99%) diff --git a/spec/features/admin/users_spec.rb b/spec/system/admin/users_spec.rb similarity index 99% rename from spec/features/admin/users_spec.rb rename to spec/system/admin/users_spec.rb index d480646fcf..067ed91f16 100644 --- a/spec/features/admin/users_spec.rb +++ b/spec/system/admin/users_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "spec_helper" +require "system_helper" describe "Managing users" do include AuthenticationHelper From 901d1cbc44c37167b1fc6cf7cb6086252b1be7a4 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 8 Nov 2021 19:15:37 +0000 Subject: [PATCH 4/4] Moves/updates variants_spec into system --- spec/{features => system}/admin/variants_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename spec/{features => system}/admin/variants_spec.rb (97%) diff --git a/spec/features/admin/variants_spec.rb b/spec/system/admin/variants_spec.rb similarity index 97% rename from spec/features/admin/variants_spec.rb rename to spec/system/admin/variants_spec.rb index 8feca13029..21a6856039 100644 --- a/spec/features/admin/variants_spec.rb +++ b/spec/system/admin/variants_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'system_helper' describe ' As an admin @@ -74,12 +74,12 @@ describe ' expected_edit_url = Regexp.new( Regexp.escape(spree.edit_admin_product_variant_path(product, variant, filter)) ) - expect(page).to have_link(I18n.t(:edit), href: expected_edit_url) + expect(page).to have_link(class: 'icon-edit', href: expected_edit_url) expected_delete_url = Regexp.new( Regexp.escape(spree.admin_product_variant_path(product, variant, filter)) ) - expect(page).to have_link(I18n.t(:delete), href: expected_delete_url) + expect(page).to have_link(class: 'icon-trash', href: expected_delete_url) end end