devise_g5_authenticatable 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb202ccac3050c390f4aee7ef1afdf625437574
-  data.tar.gz: 89c6a1f7f1aaebe7123a321c1ceec726ee17e4b7
+  metadata.gz: 647e697e95fa5a4f468529c0c016c5e9a8f2a8bd
+  data.tar.gz: 5795af637ed1ba2bce1bc36eae8fc765ea9ce88b
 SHA512:
-  metadata.gz: 4af967f531a3b3e974cdb46d462cf86a25302357af9a46ff62bc864f4253a0c99759e0bd14c7a4394798bb331dfe559b7d072c6fe54aeecd60ee71564e28bf19
-  data.tar.gz: 075ebbe92655bb91e49b35df46341d546a6dc6994f6e482e22ebd74844b07ee234f1c138660edecc8bcd49b1a9c84eaa011a9a8a6a6ea4594f013001dac4c865
+  metadata.gz: 6a17aa3b3d6cdb0a1e3b2c93aa973df48e6b6a13d6ed923cc2da1b1be813c14e110e7dcebc4ffbdc6449c7224b099bd305234a3f1024b16efb3fe79b5ed788a1
+  data.tar.gz: a59a344ee27a3927e89bae41de06c72a654b9a12acd62e36c7ddfc7e5a05743a07bbeb237e6cab70cf8637c6be1b6ea3bef4b2c95dcef241b72ff05bf6a140bf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.1.3 (2014-12-19)
+
+* Fix sign out when there isn't a locally authenticated user
+  ([#16](https://github.com/G5/devise_g5_authenticatable/pull/16)).
+
 ## v0.1.2 (2014-08-04)
 * Use existing user with updated password on duplicate user creation with
   duplicate email.

data/Gemfile

@@ -11,6 +11,7 @@ gem 'protected_attributes'
 
 group :test, :development do
   gem 'rspec-rails', '~> 2.14'
+  gem 'rspec-activemodel-mocks'
   gem 'pry'
 end
 

data/README.md

@@ -10,7 +10,7 @@ G5 users.
 
 ## Current Version
 
-0.1.0
+0.1.3
 
 ## Requirements
 

data/app/controllers/devise_g5_authenticatable/sessions_controller.rb

@@ -16,7 +16,7 @@ module DeviseG5Authenticatable
     end
 
     def destroy
-      signed_in_resource.revoke_g5_credentials!
+      signed_in_resource.try(:revoke_g5_credentials!)
       local_sign_out
       remote_sign_out
     end

data/lib/devise_g5_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseG5Authenticatable
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/controllers/sessions_controller_spec.rb

@@ -145,39 +145,47 @@ describe DeviseG5Authenticatable::SessionsController do
     end
 
     let(:model) { create(scope) }
-
-    before do
-      sign_in(scope, model)
-      allow(model).to receive(:revoke_g5_credentials!)
-    end
+    before { allow(model).to receive(:revoke_g5_credentials!) }
 
     context 'with user scope' do
       let(:scope) { :user }
 
-      it 'should sign out the user locally' do
-        expect { destroy_session }.to change { controller.current_user }.to(nil)
-      end
+      context 'when there is a current user' do
+        before { sign_in(scope, model) }
 
-      it 'should construct the sign out URL with the correct redirect URL' do
-        expect(auth_client).to receive(:sign_out_url).
-          with(root_url).
-          and_return(auth_sign_out_url)
-        destroy_session
-      end
+        it 'should sign out the user locally' do
+          expect { destroy_session }.to change { controller.current_user }.to(nil)
+        end
+
+        it 'should construct the sign out URL with the correct redirect URL' do
+          expect(auth_client).to receive(:sign_out_url).
+            with(root_url).
+            and_return(auth_sign_out_url)
+          destroy_session
+        end
+
+        it 'should redirect to the auth server to sign out globally' do
+          expect(destroy_session).to redirect_to(auth_sign_out_url)
+        end
 
-      it 'should redirect to the auth server to sign out globally' do
-        expect(destroy_session).to redirect_to(auth_sign_out_url)
+        it 'should revoke the g5 access token' do
+          expect(controller.current_user).to receive(:revoke_g5_credentials!)
+          destroy_session
+        end
       end
 
-      it 'should revoke the g5 access token' do
-        expect(controller.current_user).to receive(:revoke_g5_credentials!)
-        destroy_session
+      context 'when there is not a current user' do
+        it 'should redirect to the auth server to sign out globally' do
+          expect(destroy_session).to redirect_to(auth_sign_out_url)
+        end
       end
     end
 
     context 'with admin scope' do
       let(:scope) { :admin }
 
+      before { sign_in(scope, model) }
+
       it 'should sign out the admin locally' do
         expect { destroy_session }.to change { controller.current_admin }.to(nil)
       end

data/spec/g5/auth_password_validator_spec.rb

@@ -39,7 +39,7 @@ describe Devise::G5::AuthPasswordValidator do
       end
 
       it 'should return true' do
-        expect(valid_password?).to be_true
+        expect(valid_password?).to be_truthy
       end
     end
 
@@ -52,7 +52,7 @@ describe Devise::G5::AuthPasswordValidator do
       end
 
       it 'should return false' do
-        expect(valid_password?).to be_false
+        expect(valid_password?).to be_falsey
       end
     end
 
@@ -61,7 +61,7 @@ describe Devise::G5::AuthPasswordValidator do
       let(:runtime_error) { RuntimeError.new('Insufficient credentials for access token. Supply a username/password or authentication code.') }
 
       it 'should return false' do
-        expect(valid_password?).to be_false
+        expect(valid_password?).to be_falsey
       end
     end
 

data/spec/models/g5_authenticatable_spec.rb

@@ -184,7 +184,7 @@ describe Devise::Models::G5Authenticatable do
 
       context 'with valid input' do
         it 'should return true' do
-          expect(update_with_password).to be_true
+          expect(update_with_password).to be_truthy
         end
 
         it 'should initialize the auth user updater' do
@@ -204,7 +204,7 @@ describe Devise::Models::G5Authenticatable do
         let(:updated_email) { '' }
 
         it 'should return false' do
-          expect(update_with_password).to be_false
+          expect(update_with_password).to be_falsey
         end
 
         it 'should not update the credentials on the auth server' do
@@ -226,7 +226,7 @@ describe Devise::Models::G5Authenticatable do
         let(:current_password) { '' }
 
         it 'should return false' do
-          expect(update_with_password).to be_false
+          expect(update_with_password).to be_falsey
         end
 
         it 'should set an error on the current_password attribute' do
@@ -242,7 +242,7 @@ describe Devise::Models::G5Authenticatable do
         let(:current_password) { 'something wrong' }
 
         it 'should return false' do
-          expect(update_with_password).to be_false
+          expect(update_with_password).to be_falsey
         end
 
         it 'should set an error on the current_password attribute' do
@@ -293,7 +293,7 @@ describe Devise::Models::G5Authenticatable do
       let(:valid) { true }
 
       it 'should return true' do
-        expect(valid_password?).to be_true
+        expect(valid_password?).to be_truthy
       end
 
       it 'should initialize the validator with the model' do
@@ -309,7 +309,7 @@ describe Devise::Models::G5Authenticatable do
       let(:valid) { false }
 
       it 'should return false' do
-        expect(valid_password?).to be_false
+        expect(valid_password?).to be_falsey
       end
 
       it 'should initialize the validator with the model' do
@@ -442,7 +442,7 @@ describe Devise::Models::G5Authenticatable do
 
     it 'should not save the changes' do
       update_g5_credentials
-      expect(model.g5_access_token_changed?).to be_true
+      expect(model.g5_access_token_changed?).to be_truthy
     end
   end
 
@@ -499,19 +499,37 @@ describe Devise::Models::G5Authenticatable do
       context 'with session data' do
         let(:session) { {'omniauth.auth' => auth_data} }
 
-        it { should be_new_record }
-        its(:email) { should == email_param }
-        its(:provider) { should == auth_data.provider }
-        its(:uid) { should == auth_data.uid }
+        it { is_expected.to be_new_record }
+
+        it 'should set the email from the params' do
+          expect(new_with_session.email).to eq(email_param)
+        end
+
+        it 'should set the provider from the session' do
+          expect(new_with_session.provider).to eq(auth_data.provider)
+        end
+
+        it 'should set the uid from the session' do
+          expect(new_with_session.uid).to eq(auth_data.uid)
+        end
       end
 
       context 'without session data' do
         let(:session) { Hash.new }
 
-        it { should be_new_record }
-        its(:email) { should == email_param }
-        its(:provider) { should be_nil }
-        its(:uid) { should be_nil }
+        it { is_expected.to be_new_record }
+
+        it 'should set the email from the params' do
+          expect(new_with_session.email).to eq(email_param)
+        end
+
+        it 'should not set the provider' do
+          expect(new_with_session.provider).to be_nil
+        end
+
+        it 'should not set the uid' do
+          expect(new_with_session.uid).to be_nil
+        end
       end
     end
 
@@ -521,19 +539,37 @@ describe Devise::Models::G5Authenticatable do
       context 'with session data' do
         let(:session) { {'omniauth.auth' => auth_data} }
 
-        it { should be_new_record }
-        its(:email) { should == auth_data.info[:email] }
-        its(:provider) { should == auth_data.provider }
-        its(:uid) { should == auth_data.uid }
+        it { is_expected.to be_new_record }
+
+        it 'should set the email from the session' do
+          expect(new_with_session.email).to eq(auth_data.info[:email])
+        end
+
+        it 'should set the provider from the session' do
+          expect(new_with_session.provider).to eq(auth_data.provider)
+        end
+
+        it 'should set the uid from the session' do
+          expect(new_with_session.uid).to eq(auth_data.uid)
+        end
       end
 
       context 'without session data' do
         let(:session) { Hash.new }
 
-        it { should be_new_record }
-        its(:email) { should be_blank }
-        its(:provider) { should be_nil }
-        its(:uid) { should be_nil }
+        it { is_expected.to be_new_record }
+
+        it 'should not set the email' do
+          expect(new_with_session.email).to be_blank
+        end
+
+        it 'should not set the provider' do
+          expect(new_with_session.provider).to be_nil
+        end
+
+        it 'should not set the uid' do
+          expect(new_with_session.uid).to be_nil
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Maeve Revels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise