solidus_backend 2.10.0.beta1 → 2.10.0

data/spec/features/admin/taxons_spec.rb

@@ -75,4 +75,16 @@ describe "Taxonomies and taxons", type: :feature do
       end
     end
   end
+
+  scenario "Removes attachments from taxon" do
+    taxon = create(:taxon)
+    taxon.update(icon: File.new(file_fixture('ror_ringer.jpeg')))
+
+    visit spree.edit_admin_taxonomy_taxon_path(taxon.taxonomy, taxon.id)
+    within('#taxon_icon_field') do
+      click_on 'Remove'
+    end
+
+    expect(page).to have_content("Icon has been successfully removed!")
+  end
 end

data/spec/features/admin/users_spec.rb

@@ -158,14 +158,6 @@ describe 'Users', type: :feature do
       expect(page).to have_field('user_email', with: 'a@example.com99')
     end
 
-    it 'can edit the user password' do
-      fill_in 'user_password', with: 'welcome'
-      fill_in 'user_password_confirmation', with: 'welcome'
-      click_button 'Update'
-
-      expect(page).to have_text 'Account updated'
-    end
-
     it 'can edit user roles' do
       click_link 'Account'
 
@@ -213,6 +205,24 @@ describe 'Users', type: :feature do
       expect(user_a.reload.bill_address.address1).to eq "1313 Mockingbird Ln"
     end
 
+    it 'can edit the user password' do
+      fill_in 'user_password', with: 'welcome'
+      fill_in 'user_password_confirmation', with: 'welcome'
+      click_button 'Update'
+
+      expect(page).to have_text 'Account updated'
+    end
+
+    context 'without password permissions' do
+      custom_authorization! do |_user|
+        cannot [:update_password], Spree.user_class
+      end
+
+      it 'cannot edit the user password' do
+        expect(page).to_not have_text 'Password'
+      end
+    end
+
     context 'invalid entry' do
       around do |example|
         ::AlwaysInvalidUser = Class.new(Spree.user_class) do

data/spec/spec_helper.rb

@@ -73,6 +73,7 @@ RSpec.configure do |config|
   # examples within a transaction, comment the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
+  config.fixture_path = "spec/fixtures"
 
   config.before :suite do
     DatabaseCleaner.clean_with :truncation

data/spec/support/feature/base_feature_helper.rb

@@ -4,7 +4,12 @@ module BaseFeatureHelper
   def click_nav(nav_text, subnav_text = nil)
     primary_nav = find(".admin-nav-menu>ul>li>a", text: /#{nav_text}/i)
     if subnav_text
-      primary_nav.find('+ul>li>a', text: /#{subnav_text}/i).click
+      unless Capybara.current_driver == :rack_test
+        # we need to make the navigation visible with Selenium driver,
+        # and RackTest implementation of `hover`raises NotImplementedError
+        primary_nav.hover
+      end
+      primary_nav.sibling("ul").find("li > a", text: /#{subnav_text}/i).click
     else
       primary_nav.click
     end

data/vendor/assets/stylesheets/solidus_admin/bootstrap/_variables.scss

@@ -834,7 +834,7 @@ $figure-caption-color:              $gray-600 !default;
 // Breadcrumbs
 
 $breadcrumb-padding-y:              .75rem !default;
-$breadcrumb-padding-x:              1rem !default;
+$breadcrumb-padding-x:              3rem !default;
 $breadcrumb-item-padding:           .5rem !default;
 
 $breadcrumb-margin-bottom:          1rem !default;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.10.0.beta1
+  version: 2.10.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0.beta1
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0.beta1
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0.beta1
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0.beta1
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +186,7 @@ files:
 - app/assets/javascripts/spree/backend/collections/line_items.js
 - app/assets/javascripts/spree/backend/collections/shipments.js
 - app/assets/javascripts/spree/backend/collections/states.js
+- app/assets/javascripts/spree/backend/components/admin_nav.js
 - app/assets/javascripts/spree/backend/components/editable_table.js
 - app/assets/javascripts/spree/backend/components/number_with_currency.js
 - app/assets/javascripts/spree/backend/components/sortable_table.js
@@ -386,6 +387,7 @@ files:
 - app/controllers/spree/admin/tax_categories_controller.rb
 - app/controllers/spree/admin/tax_rates_controller.rb
 - app/controllers/spree/admin/taxonomies_controller.rb
+- app/controllers/spree/admin/taxons/attachment_controller.rb
 - app/controllers/spree/admin/taxons_controller.rb
 - app/controllers/spree/admin/users_controller.rb
 - app/controllers/spree/admin/variant_property_rule_values_controller.rb
@@ -688,6 +690,7 @@ files:
 - app/views/spree/admin/taxonomies/index.html.erb
 - app/views/spree/admin/taxonomies/new.html.erb
 - app/views/spree/admin/taxons/_form.html.erb
+- app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb
 - app/views/spree/admin/taxons/edit.html.erb
 - app/views/spree/admin/taxons/index.html.erb
 - app/views/spree/admin/taxons/search.json.jbuilder
@@ -802,6 +805,8 @@ files:
 - spec/features/admin/promotions/option_value_rule_spec.rb
 - spec/features/admin/promotions/product_rule_spec.rb
 - spec/features/admin/promotions/promotion_categories_spec.rb
+- spec/features/admin/promotions/promotion_code_batches_spec.rb
+- spec/features/admin/promotions/promotion_code_spec.rb
 - spec/features/admin/promotions/promotion_spec.rb
 - spec/features/admin/promotions/tiered_calculator_spec.rb
 - spec/features/admin/promotions/user_rule_spec.rb
@@ -811,6 +816,7 @@ files:
 - spec/features/admin/style_guide_spec.rb
 - spec/features/admin/taxons_spec.rb
 - spec/features/admin/users_spec.rb
+- spec/fixtures/files/ror_ringer.jpeg
 - spec/helpers/admin/base_helper_spec.rb
 - spec/helpers/admin/navigation_helper_spec.rb
 - spec/helpers/admin/stock_movements_helper_spec.rb
@@ -831,7 +837,6 @@ files:
 - spec/support/appear_before_matcher.rb
 - spec/support/feature/base_feature_helper.rb
 - spec/support/feature/order_feature_helper.rb
-- spec/support/ror_ringer.jpeg
 - spec/teaspoon_env.rb
 - spec/test_views/spree/admin/widgets/edit.html.erb
 - spec/test_views/spree/admin/widgets/new.html.erb
@@ -1001,7 +1006,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1009,7 +1014,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.