solidus_backend 2.5.2 → 2.6.0.rc1

data/spec/features/admin/orders/line_items_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # Tests for https://github.com/spree/spree/issues/3958's features

data/spec/features/admin/orders/listing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Orders Listing", type: :feature, js: true do

data/spec/features/admin/orders/log_entries_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Log entries", type: :feature do

data/spec/features/admin/orders/new_order_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "New Order", type: :feature do
@@ -207,6 +209,6 @@ describe "New Order", type: :feature do
     fill_in "City",                      with: "Bethesda"
     fill_in "Zip Code",                  with: "20170"
     select state.name, from: "State"
-    fill_in "Phone",                     with: "123-456-7890"
+    fill_in "Phone", with: "123-456-7890"
   end
 end

data/spec/features/admin/orders/order_details_spec.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Order Details", type: :feature, js: true do
@@ -479,7 +480,7 @@ describe "Order Details", type: :feature, js: true do
 
           @first_line_item  = order.contents.add(product2.master)
           @first_line_item.update_columns(created_at: 1.day.ago)
-          @last_line_item  = order.contents.add(product3.master)
+          @last_line_item = order.contents.add(product3.master)
           @last_line_item.update_columns(created_at: 1.day.from_now)
         end
 

data/spec/features/admin/orders/payments_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Payments', type: :feature do
@@ -9,8 +11,7 @@ describe 'Payments', type: :feature do
         order:          order,
         amount:         order.outstanding_balance,
         payment_method: create(:credit_card_payment_method),
-        state:          state
-      )
+        state:          state)
     end
 
     let(:order) { create(:completed_order_with_totals, number: 'R100', line_items_price: 50) }
@@ -27,8 +28,7 @@ describe 'Payments', type: :feature do
         create(:payment,
           order:          order,
           amount:         order.outstanding_balance,
-          payment_method: create(:check_payment_method, available_to_admin: true) # Check
-        )
+          payment_method: create(:check_payment_method, available_to_admin: true)) # Check
       end
 
       it 'capturing a check payment from a new order' do
@@ -220,8 +220,7 @@ describe 'Payments', type: :feature do
         create(:payment,
           order:          order,
           amount:         order.outstanding_balance,
-          payment_method: payment_method
-        )
+          payment_method: payment_method)
       end
 
       before do

data/spec/features/admin/orders/return_authorizations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "ReturnAuthorizations", type: :feature do

data/spec/features/admin/orders/return_payment_state_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Return payment state spec" do

data/spec/features/admin/orders/risk_analysis_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Order Risk Analysis', type: :feature do

data/spec/features/admin/orders/shipments_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Shipments", type: :feature do

data/spec/features/admin/payments/store_credits_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'Store credits', type: :feature do

data/spec/features/admin/products/edit/images_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Product Images", type: :feature do

data/spec/features/admin/products/edit/products_spec.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Product Details', type: :feature do

data/spec/features/admin/products/edit/taxons_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Product Display Order", type: :feature do
@@ -30,7 +32,7 @@ describe "Product Display Order", type: :feature do
       assert_selected_taxons([taxon_1, taxon_2])
     end
 
-    context "with an XSS attempt" do
+    context "with an XSS attempt", skip: true do
       let(:taxon_name) { %(<script>throw("XSS")</script>) }
       let!(:taxon) { create(:taxon, name: taxon_name) }
       it "displays the escaped HTML without executing it" do

data/spec/features/admin/products/edit/variants_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Product Variants", type: :feature do

data/spec/features/admin/products/option_types_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Option Types", type: :feature do

data/spec/features/admin/products/pricing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Pricing' do

data/spec/features/admin/products/products_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Products", type: :feature do

data/spec/features/admin/products/properties_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Properties", type: :feature do

data/spec/features/admin/products/stock_management_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Product Stock", type: :feature do

data/spec/features/admin/products/variant_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Variants", type: :feature do

data/spec/features/admin/promotion_adjustments_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Promotion Adjustments", type: :feature, js: true do

data/spec/features/admin/promotions/option_value_rule_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 feature 'Promotion with option value rule' do

data/spec/features/admin/promotions/product_rule_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 feature 'Promotion with product rule', js: true do

data/spec/features/admin/promotions/promotion_categories_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe 'Promotion Categories', type: :feature do
+  stub_authorization!
+
+  context "index" do
+    before do
+      create(:promotion_category, name: 'name1', code: 'code1')
+      create(:promotion_category, name: 'name2', code: 'code2')
+      visit spree.admin_promotion_categories_path
+    end
+
+    context "listing promotion categories" do
+      it "should list the existing promotion categories" do
+        within_row(1) do
+          expect(column_text(1)).to eq("name1")
+          expect(column_text(2)).to eq("code1")
+        end
+
+        within_row(2) do
+          expect(column_text(1)).to eq("name2")
+          expect(column_text(2)).to eq("code2")
+        end
+      end
+    end
+  end
+
+  context "create" do
+    before do
+      visit spree.admin_promotion_categories_path
+      click_on "New Promotion Category"
+    end
+
+    it "should allow an admin to create a new promotion category" do
+      fill_in "promotion_category_name", with: "promotion test"
+      fill_in "promotion_category_code", with: "prtest"
+      click_button "Create"
+      expect(page).to have_content("successfully created!")
+    end
+
+    it "should not allow admin to create promotion category when invalid data" do
+      fill_in "promotion_category_name", with: ""
+      fill_in "promotion_category_code", with: "prtest"
+      click_button "Create"
+      expect(page).to have_content("Name can't be blank")
+    end
+  end
+
+  context "edit" do
+    before(:each) do
+      create(:promotion_category, name: 'name1')
+      visit spree.admin_promotion_categories_path
+      within_row(1) { click_icon :edit }
+    end
+
+    it "should allow an admin to edit an existing promotion category" do
+      fill_in "promotion_category_name", with: "name 99"
+      click_button "Update"
+      expect(page).to have_content("successfully updated!")
+      expect(page).to have_content("name 99")
+    end
+
+    it "should show validation errors" do
+      fill_in "promotion_category_name", with: ""
+      click_button "Update"
+      expect(page).to have_content("Name can't be blank")
+    end
+  end
+
+  context "delete" do
+    before(:each) do
+      create(:promotion_category, name: 'name1')
+      visit spree.admin_promotion_categories_path
+    end
+
+    it "should allow an admin to delete an existing promotion category", js: true do
+      accept_alert do
+        click_icon :trash
+      end
+      expect(page).to have_content("successfully removed!")
+    end
+  end
+end

data/spec/features/admin/promotions/tiered_calculator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 feature "Tiered Calculator Promotions" do
@@ -49,7 +51,7 @@ feature "Tiered Calculator Promotions" do
 
       action.calculator = Spree::Calculator::TieredFlatRate.new
       action.calculator.preferred_base_amount = 5
-      action.calculator.preferred_tiers = {100 => 10, 200 => 15, 300 => 20}
+      action.calculator.preferred_tiers = { 100 => 10, 200 => 15, 300 => 20 }
       action.calculator.save!
 
       visit spree.edit_admin_promotion_path(promotion)

data/spec/features/admin/promotions/user_rule_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 feature 'Promotion with user rule', js: true do

data/spec/features/admin/reimbursements_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Promotions', type: :feature do

data/spec/features/admin/reports_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Reports", type: :feature do

data/spec/features/admin/store_credits_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Store credits admin" do

data/spec/features/admin/stores_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Stores', type: :feature do

data/spec/features/admin/style_guide_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Style guide", type: :feature do

data/spec/features/admin/taxons_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Taxonomies and taxons", type: :feature do

data/spec/features/admin/users_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Users', type: :feature do

data/spec/helpers/admin/base_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::Admin::BaseHelper, type: :helper do

data/spec/helpers/admin/navigation_helper_spec.rb

@@ -1,4 +1,5 @@
-# coding: UTF-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::Admin::NavigationHelper, type: :helper do

data/spec/helpers/admin/stock_movements_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::Admin::StockMovementsHelper, type: :helper do

data/spec/helpers/admin/store_credit_events_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::Admin::StoreCreditEventsHelper, type: :helper do

data/spec/helpers/promotion_rules_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 module Spree
  describe Spree::PromotionRulesHelper, type: :helper do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV["COVERAGE"]
   require 'simplecov'
   SimpleCov.start('rails')
@@ -10,7 +12,7 @@ ENV["RAILS_ENV"] ||= 'test'
 require 'solidus_backend'
 require 'spree/testing_support/dummy_app'
 DummyApp.setup(
-  gem_root: File.expand_path('../../', __FILE__),
+  gem_root: File.expand_path('..', __dir__),
   lib_name: 'solidus_backend'
 )
 

data/spec/support/appear_before_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
 
 RSpec::Matchers.define :appear_before do |expected|