solidus_backend 2.5.2 → 2.6.0.rc1

data/lib/spree/backend/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Backend
     class Engine < ::Rails::Engine

data/lib/spree_backend.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spree/backend'

data/script/rails

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/backend/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/backend/engine', __dir__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/solidus_backend.gemspec

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require_relative '../core/lib/spree/core/version.rb'
 
 Gem::Specification.new do |s|
@@ -23,13 +24,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 
-  s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'
-  s.add_dependency 'jquery-rails'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
-  s.add_dependency 'kaminari', '~> 1.1'
   s.add_dependency 'jbuilder', '~> 2.6'
+  s.add_dependency 'jquery-rails'
+  s.add_dependency 'kaminari', '~> 1.1'
+  s.add_dependency 'sass-rails'
 
-  s.add_dependency 'handlebars_assets', '~> 0.23'
   s.add_dependency 'autoprefixer-rails', '~> 7.1'
+  s.add_dependency 'handlebars_assets', '~> 0.23'
 end

data/spec/controllers/spree/admin/base_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Spree's rpsec controller tests get the Spree::ControllerHacks
 # we don't need those for the anonymous controller here, so
 # we call process directly instead of get

data/spec/controllers/spree/admin/cancellations_controller_spec.rb

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

data/spec/controllers/spree/admin/customer_returns_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/admin/missing_products_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 # This test exists in this file because in the standard admin/products_controller spec
 # There is the stub_authorization call. This call is not triggered for this test because

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "cancan"
-require "spree/testing_support/bar_ability"
 
 describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
   context "with authorization" do

data/spec/controllers/spree/admin/orders_controller_spec.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'cancan'
-require 'spree/testing_support/bar_ability'
 
 describe Spree::Admin::OrdersController, type: :controller do
   let!(:store) { create(:store) }
@@ -357,14 +358,6 @@ describe Spree::Admin::OrdersController, type: :controller do
       expect(response).to render_template :index
     end
 
-    it 'should grant access to users with an bar role' do
-      user.spree_roles << Spree::Role.find_or_create_by(name: 'bar')
-      Spree::Ability.register_ability(BarAbility)
-      get :index
-      expect(response).to render_template :index
-      Spree::Ability.remove_ability(BarAbility)
-    end
-
     it 'should deny access to users without an admin role' do
       allow(user).to receive_messages has_spree_role?: false
       get :index

data/spec/controllers/spree/admin/payment_methods_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/admin/payments_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/admin/prices_controller_spec.rb

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

data/spec/controllers/spree/admin/product_properties_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/admin/products_controller_spec.rb

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

data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb

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

data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb

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

data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb

@@ -1,21 +1,36 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::Admin::PromotionRulesController, type: :controller do
-  stub_authorization!
-
   let!(:promotion) { create(:promotion) }
 
-  it "can create a promotion rule of a valid type" do
-    post :create, params: { promotion_id: promotion.id, promotion_rule: { type: "Spree::Promotion::Rules::Product" } }
-    expect(response).to be_redirect
-    expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
-    expect(promotion.rules.count).to eq(1)
+  context "when the user is authorized" do
+    stub_authorization! do |_u|
+      Spree::PermissionSets::PromotionManagement.new(self).activate!
+    end
+
+    it "can create a promotion rule of a valid type" do
+      post :create, params: { promotion_id: promotion.id, promotion_rule: { type: "Spree::Promotion::Rules::Product" } }
+      expect(response).to be_redirect
+      expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
+      expect(promotion.rules.count).to eq(1)
+    end
+
+    it "can not create a promotion rule of an invalid type" do
+      post :create, params: { promotion_id: promotion.id, promotion_rule: { type: "Spree::InvalidType" } }
+      expect(response).to be_redirect
+      expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
+      expect(promotion.rules.count).to eq(0)
+    end
   end
 
-  it "can not create a promotion rule of an invalid type" do
-    post :create, params: { promotion_id: promotion.id, promotion_rule: { type: "Spree::InvalidType" } }
-    expect(response).to be_redirect
-    expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
-    expect(promotion.rules.count).to eq(0)
+  context "when the user is not authorized" do
+    it "sets an error message and redirects the user" do
+      post :create, params: { promotion_id: promotion.id, promotion_rule: { type: "Spree::Promotion::Rules::Product" } }
+
+      expect(flash[:error]).to eq("Authorization Failure")
+      expect(response).to redirect_to('/unauthorized')
+    end
   end
 end

data/spec/controllers/spree/admin/promotions_controller_spec.rb

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

data/spec/controllers/spree/admin/refunds_controller_spec.rb

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

data/spec/controllers/spree/admin/reimbursements_controller_spec.rb

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

data/spec/controllers/spree/admin/reports_controller_spec.rb

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

data/spec/controllers/spree/admin/resource_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb

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

data/spec/controllers/spree/admin/return_items_controller_spec.rb

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

data/spec/controllers/spree/admin/root_controller_spec.rb

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

data/spec/controllers/spree/admin/search_controller_spec.rb

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

data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb

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

data/spec/controllers/spree/admin/stock_items_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/admin/stock_locations_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/admin/store_credits_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 shared_examples "update reason loader" do

data/spec/controllers/spree/admin/users_controller_spec.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
-require 'spree/testing_support/bar_ability'
 
 describe Spree::Admin::UsersController, type: :controller do
   let(:user) { create(:user) }

data/spec/controllers/spree/admin/variants_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/features/admin/configuration/payment_methods_spec.rb

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

data/spec/features/admin/configuration/shipping_methods_spec.rb

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

data/spec/features/admin/configuration/stock_locations_spec.rb

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

data/spec/features/admin/configuration/store_spec.rb

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

data/spec/features/admin/configuration/tax_categories_spec.rb

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

data/spec/features/admin/configuration/tax_rates_spec.rb

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

data/spec/features/admin/configuration/taxonomies_spec.rb

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

data/spec/features/admin/configuration/zones_spec.rb

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

data/spec/features/admin/homepage_spec.rb

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

data/spec/features/admin/javascript_format_money_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'JS Spree.formatMoney', js: true do

data/spec/features/admin/locale_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "setting locale", type: :feature do
@@ -11,6 +13,7 @@ describe "setting locale", type: :feature do
         month_names: []
       },
       spree: {
+        i18n: { this_file_language: "Français" },
         admin: {
           tab: { orders: "Ordres" }
         },

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Customer Details", type: :feature, js: true do
@@ -199,6 +201,6 @@ describe "Customer Details", type: :feature, js: true do
     fill_in "City",                    with: "Bethesda"
     fill_in "Zip Code",                with: "20170"
     select 'Alabama', from: "State"
-    fill_in "Phone",                   with: "123-456-7890"
+    fill_in "Phone", with: "123-456-7890"
   end
 end