solidus_auth_devise 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3af627c22bba6eef8baec7a7c4295ebfa965f53
-  data.tar.gz: 08c4f939fe23134adf2b5fae23c8f925351259dc
+  metadata.gz: 601953fd74741f135c859fa0a62ff28186f3bf7e
+  data.tar.gz: 769599d2154ca0ed69cd3241e9b29e610c6d7b14
 SHA512:
-  metadata.gz: 59324791f413c3eb9875cb673f6ff9dd64c836844fcf2bc4c58fb3340a3ce70b37d32755fbecc0f691907d75f8939264246d5c1d98af262a469c51ca3cf14bbe
-  data.tar.gz: 563da308b471cfa8c22252f30618571fd382d89caaf5cefaa23dd4205b5c80dff211fd791193b5af3b37d15185ced1b90d27a672bfac83fd0896c64c8d2caf10
+  metadata.gz: ed4af47908d361784886f3587cb6fcc97c082c71f4ca055ae7aa13cc1b1a04f0adb53caf104563eddf4596f80fc218a0b52657a3fb07c235b0f5d1006b8606ec
+  data.tar.gz: 7c84c3019011bdebef14e2d8cebe422f0b5a0e324ccf678b178afc8177aac1a14541a688e65bb1ef2c40df0f3526570d1bb5a558883e86a9a562c5b55e9fc8de

data/.gitignore

@@ -1,4 +1,5 @@
 spec/dummy
+spec/examples.txt
 .sass-cache
 coverage
 Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Master (unreleased)
 
+## Solidus Auth Devise v1.6.2 (2016-11-18)
+
+* Fix an issue where invalid addresses could be persisted after starting a
+  checkout as a guest and then returning to the cart page.
+
 ## Solidus Auth Devise v1.6.1 (2016-08-24)
 
 * Replace usages of `before_filter` with `before_action` (#73)

data/README.md

@@ -17,7 +17,7 @@ Then, run `bundle install`.
 After that's done, you can install and run the necessary migrations, then seed the database:
 
 ```shell
-bundle exec rake solidus_auth:install:migration
+bundle exec rake solidus_auth:install:migrations
 bundle exec rake db:migrate
 bundle exec rake db:seed
 ```

data/lib/controllers/frontend/spree/checkout_controller_decorator.rb

@@ -4,12 +4,16 @@ Spree::CheckoutController.class_eval do
     except: [:registration, :update_registration]
   prepend_before_action :check_authorization
 
+  # This action builds some associations on the order, ex. addresses, which we
+  # don't to build or save here.
+  skip_before_action :setup_for_current_state, only: [:registration, :update_registration]
+
   def registration
     @user = Spree::User.new
   end
 
   def update_registration
-    if params[:order][:email] =~ Devise.email_regexp && current_order.update_attribute(:email, params[:order][:email])
+    if params[:order][:email] =~ Devise.email_regexp && current_order.update_attributes(email: params[:order][:email])
       redirect_to spree.checkout_path
     else
       flash[:registration_error] = t(:email_is_invalid, scope: [:errors, :messages])

data/solidus_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_auth_devise"
-  s.version     = "1.6.1"
+  s.version     = "1.6.2"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -1,21 +1,18 @@
 RSpec.describe Spree::CheckoutController, type: :controller do
 
-  let(:order) { create(:order_with_line_items, email: nil, user: nil) }
+  let(:order) { create(:order_with_line_items, email: nil, user: nil, guest_token: token) }
   let(:user)  { build(:user, spree_api_key: 'fake') }
   let(:token) { 'some_token' }
+  let(:cookie_token) { token }
 
   before do
+    request.cookie_jar.signed[:guest_token] = cookie_token
     allow(controller).to receive(:current_order) { order }
     allow(order).to receive(:confirmation_required?) { true }
   end
 
   context '#edit' do
     context 'when registration step enabled' do
-      before do
-        allow(controller).to receive(:check_authorization)
-        Spree::Auth::Config.set(registration_step: true)
-      end
-
       context 'when authenticated as registered user' do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
@@ -60,7 +57,6 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     context 'when registration step disabled' do
       before do
         Spree::Auth::Config.set(registration_step: false)
-        allow(controller).to receive(:check_authorization)
       end
 
       context 'when authenticated as registered' do
@@ -119,7 +115,6 @@ RSpec.describe Spree::CheckoutController, type: :controller do
 
   context '#registration' do
     it 'does not check registration' do
-      allow(controller).to receive(:check_authorization)
       expect(controller).not_to receive(:check_registration)
       get :registration
     end
@@ -132,34 +127,70 @@ RSpec.describe Spree::CheckoutController, type: :controller do
   end
 
   context '#update_registration' do
-    let(:user) { build(:user) }
+    subject { put :update_registration, { order: { email: email } } }
+    let(:email) { 'foo@example.com' }
 
     it 'does not check registration' do
-      controller.stub :check_authorization
-      order.stub update_attributes: true
-      controller.should_not_receive :check_registration
-      put :update_registration, { order: { email: 'foo@example.com' } }
-    end
-
-    it 'renders the registration view if unable to save' do
-      allow(controller).to receive(:check_authorization)
-      put :update_registration, { order: { email: 'invalid' } }
-      expect(flash[:registration_error]).to eq I18n.t(:email_is_invalid, scope: [:errors, :messages])
-      expect(response).to render_template :registration
+      expect(controller).not_to receive(:check_registration)
+      subject
     end
 
     it 'redirects to the checkout_path after saving' do
-      allow(order).to receive(:update_attributes) { true }
-      allow(controller).to receive(:check_authorization)
-      put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+      subject
       expect(response).to redirect_to spree.checkout_path
     end
 
-    it 'checks if the user is authorized for :edit' do
-      request.cookie_jar.signed[:guest_token] = token
-      allow(order).to receive(:update_attributes) { true }
-      expect(controller).to receive(:authorize!).with(:edit, order, token)
-      put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+    # Regression test for https://github.com/solidusio/solidus/issues/1588
+    context 'order in address state' do
+      let(:order) do
+        create(
+          :order_with_line_items,
+          email: nil,
+          user: nil,
+          guest_token: token,
+          bill_address: nil,
+          ship_address: nil,
+          state: 'address'
+        )
+      end
+
+      # This may seem out of left field, but previously there was an issue
+      # where address would be built in a before filter and then would be saved
+      # when trying to update the email.
+      it "doesn't create addresses" do
+        expect {
+          subject
+        }.not_to change { Spree::Address.count }
+        expect(response).to redirect_to spree.checkout_path
+      end
+    end
+
+    context 'invalid email' do
+      let(:email) { 'invalid' }
+
+      it 'renders the registration view' do
+        subject
+        expect(flash[:registration_error]).to eq I18n.t(:email_is_invalid, scope: [:errors, :messages])
+        expect(response).to render_template :registration
+      end
+    end
+
+    context 'with wrong order token' do
+      let(:cookie_token) { 'lol_no_access' }
+
+      it 'redirects to login' do
+        put :update_registration, { order: { email: 'foo@example.com' } }
+        expect(response).to redirect_to(login_path)
+      end
+    end
+
+    context 'without order token' do
+      let(:cookie_token) { nil }
+
+      it 'redirects to login' do
+        put :update_registration, { order: { email: 'foo@example.com' } }
+        expect(response).to redirect_to(login_path)
+      end
     end
   end
 end

data/spec/features/change_email_spec.rb

@@ -1,6 +1,8 @@
 RSpec.feature 'Change email', type: :feature do
 
   background do
+    Spree::Auth::Config.set(signout_after_password_change: false)
+
     user = create(:user)
     visit spree.root_path
     click_link 'Login'

data/spec/features/checkout_spec.rb

@@ -23,9 +23,28 @@ RSpec.feature 'Checkout', :js, type: :feature do
     visit spree.root_path
   end
 
+  # Regression test for https://github.com/solidusio/solidus/issues/1588
+  scenario 'leaving and returning to address step' do
+    Spree::Auth::Config.set(registration_step: true)
+    click_link 'RoR Mug'
+    click_button 'Add To Cart'
+    within('h1') { expect(page).to have_text 'Shopping Cart' }
+    click_button 'Checkout'
+
+    within '#guest_checkout' do
+      fill_in 'Email', with: 'test@example.com'
+    end
+    click_on 'Continue'
+
+    click_on 'Cart'
+
+    click_on 'Checkout'
+
+    expect(page).to have_content "Billing Address"
+  end
+
   context 'without payment being required' do
     scenario 'allow a visitor to checkout as guest, without registration' do
-      Spree::Auth::Config.set(registration_step: true)
       click_link 'RoR Mug'
       click_button 'Add To Cart'
       within('h1') { expect(page).to have_text 'Shopping Cart' }

data/spec/models/user_spec.rb

@@ -63,6 +63,8 @@ RSpec.describe Spree::User, type: :model do
   end
 
   describe "confirmable" do
+    before { skip "this introduces a run order dependency" }
+
     it "is confirmable if the confirmable option is enabled" do
       set_confirmable_option(true)
       Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))

data/spec/spec_helper.rb

@@ -18,6 +18,9 @@ RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.use_transactional_fixtures = false
+  config.order = :random
+
+  config.example_status_persistence_file_path = "./spec/examples.txt"
 
   config.mock_with :rspec do |mock|
     mock.syntax = [:should, :expect]

data/spec/support/preferences.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.before do
+    Spree::Auth::Config.preference_store = Spree::Auth::Config.default_preferences
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -414,6 +414,7 @@ files:
 - spec/support/database_cleaner.rb
 - spec/support/email.rb
 - spec/support/factory_girl.rb
+- spec/support/preferences.rb
 - spec/support/spree.rb
 homepage: 
 licenses:
@@ -475,4 +476,5 @@ test_files:
 - spec/support/database_cleaner.rb
 - spec/support/email.rb
 - spec/support/factory_girl.rb
+- spec/support/preferences.rb
 - spec/support/spree.rb