solidus_auth_devise 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5cf4aa80513d06a54e23702ed88741c43c7382a
-  data.tar.gz: 657066204c77305b7e9dbfa8fe00f2d064cb518b
+  metadata.gz: 34bf236613b21c40c9b0532d382a64591d98535f
+  data.tar.gz: bddc8a37353b1bc5ac272056749dad53790ad72c
 SHA512:
-  metadata.gz: 76a34014abe38b2f73397f0a969719c2d35523252e76e830b550fa6d9935c1615e3157f2df99372ac50930a4980186597dacd11c96ffbbb32031d39e81eceb93
-  data.tar.gz: b922becf025a09a3203ec8b79414d39f5daa6f109c866d456bbac32295dc3cc0e6ea0fe0a6708133e64cbe057dcecc20f4754ee7de5f17796e4f6b3b74259c90
+  metadata.gz: 91628c33c7858a70747284261561bbd22e70efcaf42a32a81b0ae06db0476272be59bd9ff86a76c2af91fc0831ea41cfc6d9397259f2866711379604b5383bc9
+  data.tar.gz: c9b39d7ccec95f652850de70b293757fb8e8066c394def7f0c8e60af95818b597714e1f11d1ce7ba470ee97006c090f1cc6bac68c1c8704b265b250e45bdc570

data/app/mailers/spree/user_mailer.rb

@@ -2,14 +2,14 @@ module Spree
   class UserMailer < BaseMailer
     def reset_password_instructions(user, token, *args)
       @edit_password_reset_url = spree.edit_spree_user_password_url(:reset_password_token => token, :host => Spree::Store.current.url)
-
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, :scope => [:devise, :mailer, :reset_password_instructions])
+      @store = Spree::Store.current
+      mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, :scope => [:devise, :mailer, :reset_password_instructions])}"
     end
 
     def confirmation_instructions(user, token, opts={})
       @confirmation_url = spree.spree_user_confirmation_url(:confirmation_token => token, :host => Spree::Store.current.url)
-
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, :scope => [:devise, :mailer, :confirmation_instructions])
+      @store = Spree::Store.current
+      mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, :scope => [:devise, :mailer, :confirmation_instructions])}"
     end
   end
 end

data/app/models/spree/user.rb

@@ -1,7 +1,5 @@
 module Spree
   class User < ActiveRecord::Base
-    include UserAddress
-    include UserPaymentSource
     include UserMethods
 
     devise :database_authenticatable, :registerable, :recoverable,

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.2.0"
+  s.version     = "1.2.1"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 

data/spec/features/admin/sign_in_spec.rb

@@ -39,6 +39,6 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     click_button 'Login'
 
     expect(page).to have_text 'Logged in as: admin@person.com'
-    expect(current_path).to eq '/admin/dashboards/home'
+    expect(current_path).to eq '/admin/orders'
   end
 end

data/spec/features/sign_in_spec.rb

@@ -39,7 +39,7 @@ RSpec.feature 'Sign In', type: :feature do
     click_button 'Login'
 
     expect(page).to have_text 'Logged in as: admin@person.com'
-    expect(current_path).to eq '/admin/dashboards/home'
+    expect(current_path).to eq '/admin/orders'
   end
 
   it "should store the user previous location" do

data/spec/support/spree.rb

@@ -4,22 +4,6 @@ require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
 
-# Monkey patch for pending: https://github.com/spree/spree/pull/5182
-module Spree
-  module TestingSupport
-    module AuthorizationHelpers
-      module Controller
-        def stub_authorization!(&block)
-          ability_class = build_ability(&block)
-          before do
-            allow(controller).to receive(:current_ability).and_return(ability_class.new(nil))
-          end
-        end
-      end
-    end
-  end
-end
-
 RSpec.configure do |config|
   config.include Spree::TestingSupport::UrlHelpers
   config.include Spree::TestingSupport::ControllerRequests, type: :controller

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -350,7 +350,6 @@ files:
 - lib/views/frontend/spree/users/edit.html.erb
 - lib/views/frontend/spree/users/show.html.erb
 - solidus_auth_devise.gemspec
-- spec/controllers/spree/admin/orders_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/controllers/spree/user_passwords_controller_spec.rb
@@ -413,7 +412,6 @@ specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by
   using Devise and CanCan.
 test_files:
-- spec/controllers/spree/admin/orders_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/controllers/spree/user_passwords_controller_spec.rb
@@ -449,3 +447,4 @@ test_files:
 - spec/support/email.rb
 - spec/support/factory_girl.rb
 - spec/support/spree.rb
+has_rdoc: 

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

@@ -1,14 +0,0 @@
-module Spree
-  module Admin
-    RSpec.describe OrdersController, type: :controller do
-      stub_authorization!
-
-      context '#authorize_admin' do
-        it 'grants access to users with an admin role' do
-          spree_get :new
-          expect(response).to redirect_to spree.edit_admin_order_path(Order.last)
-        end
-      end
-    end
-  end
-end