Revert "Reverts feature specs back to feature spec settings"

This reverts commit 628fac9.

spec/features/admin/adjustments_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
-feature '
+describe '
     As an administrator
     I want to manage adjustments on orders
 ', js: true do

spec/features/admin/authentication_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature "Authentication", js: true do
+describe "Authentication", js: true do
   include UIComponentHelper
   include AuthenticationHelper
   include WebHelper

spec/features/admin/bulk_order_management_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
   As an Administrator
   I want to be able to manage orders in bulk
 ', js: true do
@@ -115,7 +115,7 @@
       end
     end
 
-    feature "sorting of line items" do
+    describe "sorting of line items" do
       let!(:o1) {
         create(:order_with_distributor, state: 'complete', shipment_state: 'ready',
                                         completed_at: Time.zone.now)

spec/features/admin/bulk_product_update_spec.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
   As an Administrator
   I want to be able to manage products in bulk
 ', js: true do
   include AdminHelper
   include AuthenticationHelper
   include WebHelper
 
-  feature "listing products" do
+  describe "listing products" do
     before do
       login_as_admin
     end
@@ -105,7 +105,7 @@
     end
   end
 
-  feature "listing variants" do
+  describe "listing variants" do
     before do
       login_as_admin
     end
@@ -486,8 +486,8 @@
     expect(p1.name).to eq "new product1"
   end
 
-  feature "using action buttons" do
-    feature "using delete buttons" do
+  describe "using action buttons" do
+    describe "using delete buttons" do
       let!(:p1) { FactoryBot.create(:product) }
       let!(:p2) { FactoryBot.create(:product) }
       let!(:v1) { p1.variants.first }
@@ -537,7 +537,7 @@
       end
     end
 
-    feature "using edit buttons" do
+    describe "using edit buttons" do
       let!(:p1) { FactoryBot.create(:product) }
       let!(:p2) { FactoryBot.create(:product) }
       let!(:v1) { p1.variants.first }
@@ -611,7 +611,7 @@
       end
     end
 
-    feature "using clone buttons" do
+    describe "using clone buttons" do
       it "shows a clone button for products, which duplicates the product and adds it to the page when clicked" do
         p1 = FactoryBot.create(:product, name: "P1")
         p2 = FactoryBot.create(:product, name: "P2")
@@ -637,8 +637,8 @@
     end
   end
 
-  feature "using the page" do
-    feature "using column display dropdown" do
+  describe "using the page" do
+    describe "using column display dropdown" do
       it "shows a column display dropdown, which shows a list of columns when clicked" do
         FactoryBot.create(:simple_product)
         login_as_admin_and_visit spree.admin_products_path
@@ -661,7 +661,7 @@
       end
     end
 
-    feature "using filtering controls" do
+    describe "using filtering controls" do
       it "displays basic filtering controls which filter the product list" do
         s1 = create(:supplier_enterprise)
         s2 = create(:supplier_enterprise)
@@ -823,7 +823,7 @@
     end
   end
 
-  feature "Updating product image" do
+  describe "Updating product image" do
     let!(:product) { create(:simple_product, name: "Carrots") }
 
     it "displays product images and image upload modal" do

spec/features/admin/customers_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature 'Customers' do
+describe 'Customers' do
   include AdminHelper
   include AuthenticationHelper
   include WebHelper
@@ -13,7 +13,7 @@
     let(:managed_distributor2) { create(:distributor_enterprise, owner: user) }
     let(:unmanaged_distributor) { create(:distributor_enterprise) }
 
-    feature "using the customers index", js: true do
+    describe "using the customers index", js: true do
       let!(:customer1) { create(:customer, enterprise: managed_distributor1, code: nil) }
       let!(:customer2) { create(:customer, enterprise: managed_distributor1, code: nil) }
       let!(:customer3) { create(:customer, enterprise: unmanaged_distributor) }
@@ -101,7 +101,7 @@
         }.to change{ Customer.count }.by(-1)
       end
 
-      feature "for a shop with multiple customers" do
+      describe "for a shop with multiple customers" do
         let!(:order1) {
           create(:order, total: 0, payment_total: 88, distributor: managed_distributor1, user: nil,
                          state: 'complete', customer: customer1)
@@ -256,7 +256,7 @@
         expect(customer2.reload.code).to be nil
       end
 
-      feature 'updating a customer addresses' do
+      describe 'updating a customer addresses' do
         before do
           select2_select managed_distributor2.name, from: "shop_id"
         end
@@ -328,7 +328,7 @@ def wait_for_modal_fade_in(time = 0.4)
         end
       end
 
-      feature "creating a new customer" do
+      describe "creating a new customer" do
         context "when no shop has been selected" do
           it "asks the user to select a shop" do
             accept_alert 'Please select a shop first' do

spec/features/admin/enterprise_fees_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
     As an administrator
     I want to manage enterprise fees
 ', js: true do

spec/features/admin/enterprise_groups_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
     As an administrator
     I want to manage enterprise groups
 ' do

spec/features/admin/enterprise_relationships_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
   As an Administrator
   I want to manage relationships between enterprises
 ', js: true do

spec/features/admin/enterprise_roles_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
   As an Administrator
   I want to manage relationships between users and enterprises
 ', js: true do
@@ -88,7 +88,7 @@
       expect(EnterpriseRole.where(id: er.id)).to be_empty
     end
 
-    feature "using the enterprise managers interface" do
+    describe "using the enterprise managers interface" do
       let!(:user1) { create(:user, email: '[email protected]') }
       let!(:user2) { create(:user, email: '[email protected]') }
       let!(:user3) { create(:user, email: '[email protected]', confirmed_at: nil) }

spec/features/admin/enterprise_user_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
-feature '
+describe '
     As a Super User
     I want to setup users to manage an enterprise
 ' do
@@ -19,7 +19,7 @@
     create(:distributor_enterprise, name: 'Distributor profile', sells: 'none')
   }
 
-  feature "creating an enterprise user" do
+  describe "creating an enterprise user" do
     context "with a limitted number of owned enterprises" do
       it "setting the enterprise ownership limit" do
         expect(user.enterprise_limit).to eq 5
@@ -35,7 +35,7 @@
     end
   end
 
-  feature "system management lockdown" do
+  describe "system management lockdown" do
     before do
       user.enterprise_roles.create!(enterprise: supplier1)
       login_as user

spec/features/admin/enterprises_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
-feature '
+describe '
     As an administrator
     I want to manage enterprises
 ' do
@@ -219,7 +219,7 @@
     end
   end
 
-  feature "producer properties" do
+  describe "producer properties" do
     it "creates producer properties" do
       # Given a producer enterprise
       s = create(:supplier_enterprise)
@@ -382,7 +382,7 @@
       expect(distributor1.reload.name).to eq('Eaterprises')
     end
 
-    feature "enterprises I have edit permission for, but do not manage" do
+    describe "enterprises I have edit permission for, but do not manage" do
       it "allows me to edit them" do
         visit admin_enterprises_path
         within("tbody#e_#{distributor3.id}") { click_link 'Settings' }

spec/features/admin/invoice_print_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
-feature '
+describe '
     As an administrator
     I want to print a invoice as PDF
 ', js: false do
@@ -23,7 +23,7 @@
                                                 payment_state: 'balance_due')
   end
 
-  feature "that contains right Payment Description at Checkout information" do
+  describe "that contains right Payment Description at Checkout information" do
     let!(:payment_method1) do
       create(:stripe_sca_payment_method, distributors: [distributor], description: "description1")
     end

spec/features/admin/multilingual_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature 'Multilingual', js: true do
+describe 'Multilingual', js: true do
   include AuthenticationHelper
   include WebHelper
   let(:admin_role) { Spree::Role.find_or_create_by!(name: 'admin') }

spec/features/admin/order_cycles_complex_nav_check_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
     As an administrator
     I want to be alerted when I navigate away from a dirty order cycle form
 ', js: true do

spec/features/admin/order_print_ticket_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
-feature '
+describe '
     As an administrator
     I want to print a ticket for an order
 ', js: true do
@@ -32,7 +32,7 @@
       Spree::Config[:enable_receipt_printing?] = true
     end
 
-    feature "viewing the edit page" do
+    describe "viewing the edit page" do
       it "can print an order's ticket" do
         visit spree.edit_admin_order_path(order)
 

spec/features/admin/order_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
-feature '
+describe '
     As an administrator
     I want to create and edit orders
 ', js: true do
@@ -303,7 +303,7 @@ def new_order_with_distribution(distributor, order_cycle)
       login_as @enterprise_user
     end
 
-    feature "viewing the edit page" do
+    describe "viewing the edit page" do
       let!(:shipping_method_for_distributor1) do
         create(:shipping_method, name: "Normal", distributors: [distributor1])
       end

spec/features/admin/orders_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require "system_helper"
 
-feature '
+describe '
     As an administrator
     I want to manage orders
 ', js: true do

spec/features/admin/overview_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature '
+describe '
   As a backend user
   I want to be given information about the state of my enterprises, products and order cycles
 ', js: true do