warden-github-rails 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4b21d7a28bf42f74da5eafddadfad17630e05a0
-  data.tar.gz: aa412e1be503469bc2771ee0cb51a820445f0268
+  metadata.gz: 7a96bbb9fc625a4f55a485c3b6be6d1643370446
+  data.tar.gz: 31f25b811a1ca9e55ab0f2a090a5ba475dfd3a20
 SHA512:
-  metadata.gz: 5e5c27ca1244250f732b1ea0ce6065006d0c46134d7bb451aa96e76e7d3014b23e1d707886d8602539774865b402165631671c5adccefe78d9a006d7f2048621
-  data.tar.gz: 2d8abd4c0e093228ca14cd82fb29b7914ceb8670d6950cdf3f9d8ccf6f9e391dc069d18c23e7658e5aafdc4dc4ddcb2980db17d4ae48d23b2da85a29499f2462
+  metadata.gz: d2e5abd46558cf29888cf3eab6ee6ae3589fb3800d8f65095557bc4610c8138112db42f9f9f4ef999636075c2c906a3322de4952e6ca0adf718022ab8d4916e2
+  data.tar.gz: 1e0b6b703e7d12fb1c3fcd7e37299fb68fe0f453499fd20bf75ff984e749561de59b85c3b4c02afdcf036a121771c33588acb436f6cb2763f5aee21c064dbbab

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.1.2
+
+- Prevent loss of memberships in mocked user when marshaling
+
 ## v1.1.1
 
 - Transform string to integer when stubbing team membership

data/README.md

@@ -214,7 +214,7 @@ This gems comes with a couple test helpers to make your life easier:
 
     ```ruby
     subject { get '/some-url-that-triggers-oauth' }
-    it { should be_github_oauth_redirect }
+    it { is_expected.to be_github_oauth_redirect }
     ```
 
 -   A mock user that allows you to stub team and organization memberships:

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/warden/github/rails/test_helpers/mock_user.rb

@@ -25,6 +25,15 @@ module Warden
           def organization_member?(id)
             memberships[:org].include?(id)
           end
+
+          def marshal_dump
+            [memberships, super]
+          end
+
+          def marshal_load(data)
+            @memberships, super_data = data
+            super(super_data)
+          end
         end
       end
     end

data/spec/integration/controller_helpers_spec.rb

@@ -78,7 +78,7 @@ describe 'controller helpers' do
         subject(:request) { get "/#{type}/session" }
 
         context 'when not logged in' do
-          it 'should be nil' do
+          it 'returns nil' do
             expect(request.body).to be_blank
           end
         end

data/spec/integration/membership_spec.rb

@@ -6,7 +6,7 @@ describe 'request to a protected resource' do
       subject { get '/team/protected' }
 
       context 'when not logged in' do
-        it { should be_github_oauth_redirect }
+        it { is_expected.to be_github_oauth_redirect }
       end
 
       context 'when logged in' do
@@ -16,12 +16,12 @@ describe 'request to a protected resource' do
             user.stub_membership(team: 123)
           end
 
-          it { should be_ok }
+          it { is_expected.to be_ok }
         end
 
         context 'and not team member' do
           before { github_login }
-          it { should be_not_found}
+          it { is_expected.to be_not_found}
         end
       end
     end
@@ -30,7 +30,7 @@ describe 'request to a protected resource' do
       subject { get '/team_alias/protected' }
 
       context 'when not logged in' do
-        it { should be_github_oauth_redirect }
+        it { is_expected.to be_github_oauth_redirect }
       end
 
       context 'when logged in' do
@@ -40,12 +40,12 @@ describe 'request to a protected resource' do
             user.stub_membership(team: 456)
           end
 
-          it { should be_ok }
+          it { is_expected.to be_ok }
         end
 
         context 'and not team member' do
           before { github_login }
-          it { should be_not_found}
+          it { is_expected.to be_not_found}
         end
       end
     end
@@ -60,12 +60,12 @@ describe 'request to a protected resource' do
             user.stub_membership(team: 123)
           end
 
-          it { should be_ok }
+          it { is_expected.to be_ok }
         end
 
         context 'and not team member' do
           before { github_login }
-          it { should be_not_found}
+          it { is_expected.to be_not_found}
         end
       end
     end
@@ -77,7 +77,7 @@ describe 'request to a protected resource' do
         subject { get "/#{key}/protected" }
 
         context 'when not logged in' do
-          it { should be_github_oauth_redirect }
+          it { is_expected.to be_github_oauth_redirect }
         end
 
         context 'when logged in' do
@@ -87,12 +87,12 @@ describe 'request to a protected resource' do
               user.stub_membership(org: value)
             end
 
-            it { should be_ok }
+            it { is_expected.to be_ok }
           end
 
           context 'and not organization member' do
             before { github_login }
-            it { should be_not_found }
+            it { is_expected.to be_not_found }
           end
         end
       end
@@ -108,12 +108,12 @@ describe 'request to a protected resource' do
             user.stub_membership(org: 'some_org')
           end
 
-          it { should be_ok }
+          it { is_expected.to be_ok }
         end
 
         context 'and not organization member' do
           before { github_login }
-          it { should be_not_found}
+          it { is_expected.to be_not_found}
         end
       end
     end
@@ -131,12 +131,12 @@ describe 'request to a resource that only exists when logged in' do
           user.stub_membership(team: 123)
         end
 
-        it { should be_ok }
+        it { is_expected.to be_ok }
       end
 
       context 'when not team member' do
         before { github_login }
-        it { should be_not_found}
+        it { is_expected.to be_not_found}
       end
     end
 
@@ -149,12 +149,12 @@ describe 'request to a resource that only exists when logged in' do
           user.stub_membership(team: 456)
         end
 
-        it { should be_ok }
+        it { is_expected.to be_ok }
       end
 
       context 'when not team member' do
         before { github_login }
-        it { should be_not_found}
+        it { is_expected.to be_not_found}
       end
     end
   end
@@ -170,12 +170,12 @@ describe 'request to a resource that only exists when logged in' do
             user.stub_membership(org: value)
           end
 
-          it { should be_ok }
+          it { is_expected.to be_ok }
         end
 
         context 'when not organization member' do
           before { github_login }
-          it { should be_not_found }
+          it { is_expected.to be_not_found }
         end
       end
     end

data/spec/integration/route_spec.rb

@@ -4,12 +4,12 @@ describe 'request to a protected resource' do
   subject { get '/protected' }
 
   context 'when not logged in' do
-    it { should be_github_oauth_redirect }
+    it { is_expected.to be_github_oauth_redirect }
   end
 
   context 'when logged in' do
     before { github_login }
-    it { should be_ok }
+    it { is_expected.to be_ok }
   end
 
   context 'with multiple scopes' do
@@ -17,12 +17,12 @@ describe 'request to a protected resource' do
 
     context 'when logged in in the wrong scope' do
       before { github_login }
-      it { should be_github_oauth_redirect }
+      it { is_expected.to be_github_oauth_redirect }
     end
 
     context 'when logged in in the correct scope' do
       before { github_login(:admin) }
-      it { should be_ok }
+      it { is_expected.to be_ok }
     end
   end
 end
@@ -31,12 +31,12 @@ describe 'request to a resource that only exists when logged in' do
   subject { get '/conditional' }
 
   context 'when not logged in' do
-    it { should be_not_found }
+    it { is_expected.to be_not_found }
   end
 
   context 'when logged in' do
     before { github_login }
-    it { should be_ok }
+    it { is_expected.to be_ok }
   end
 
   context 'with mutliple scopes' do
@@ -44,12 +44,12 @@ describe 'request to a resource that only exists when logged in' do
 
     context 'when logged in in the wrong scope' do
       before { github_login }
-      it { should be_not_found }
+      it { is_expected.to be_not_found }
     end
 
     context 'when logged in in the correct scope' do
       before { github_login(:admin) }
-      it { should be_ok }
+      it { is_expected.to be_ok }
     end
   end
 end
@@ -58,12 +58,12 @@ describe 'request to a resource that only exists when logged out' do
   subject { get '/conditional_inverse' }
 
   context 'when not logged in' do
-    it { should be_ok }
+    it { is_expected.to be_ok }
   end
 
   context 'when logged in' do
     before { github_login }
-    it { should be_not_found }
+    it { is_expected.to be_not_found }
   end
 
   context 'with mutliple scopes' do
@@ -71,12 +71,12 @@ describe 'request to a resource that only exists when logged out' do
 
     context 'when logged in in the wrong scope' do
       before { github_login }
-      it { should be_ok }
+      it { is_expected.to be_ok }
     end
 
     context 'when logged in in the correct scope' do
       before { github_login(:admin) }
-      it { should be_not_found }
+      it { is_expected.to be_not_found }
     end
   end
 end

data/spec/rails_app/config/environments/development.rb

@@ -1,4 +1,5 @@
 RailsApp::Application.configure do
+  config.eager_load = false
   config.cache_classes = false
   config.whiny_nils = true
   config.consider_all_requests_local       = true

data/spec/rails_app/config/environments/production.rb

@@ -1,4 +1,5 @@
 RailsApp::Application.configure do
+  config.eager_load = true
   config.cache_classes = true
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

data/spec/rails_app/config/environments/test.rb

@@ -1,4 +1,5 @@
 RailsApp::Application.configure do
+  config.eager_load = true
   config.cache_classes = true
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"

data/spec/spec_helper.rb

@@ -25,9 +25,7 @@ ENV['GITHUB_CLIENT_ID']     = 'test_client_id'
 ENV['GITHUB_CLIENT_SECRET'] = 'test_client_secret'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
   config.order = 'random'
   config.expect_with :rspec do |c|
     c.syntax = :expect

data/spec/unit/mock_user_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Warden::GitHub::Rails::TestHelpers::MockUser do
-  it { should be_a Warden::GitHub::User }
+  it { is_expected.to be_a Warden::GitHub::User }
 
   describe '#stub_membership' do
     subject(:user) { described_class.new }
@@ -18,4 +18,12 @@ describe Warden::GitHub::Rails::TestHelpers::MockUser do
       expect(user).to be_organization_member('foobar')
     end
   end
+
+  it 'can be marshaled' do
+    user = described_class.new
+    user.stub_membership(org: ['apple', 'facebook'], team: [12, 34])
+    marshaled_user = Marshal.load(Marshal.dump(user))
+
+    expect(marshaled_user.memberships).to eq(user.memberships)
+  end
 end

data/spec/unit/test_helpers_spec.rb

@@ -2,38 +2,30 @@ require 'spec_helper'
 
 describe Warden::GitHub::Rails::TestHelpers do
   describe '#github_login' do
+    before { allow(self).to receive(:login_as) }
+
     context 'when no scope is specified' do
       it 'uses the default scope from config to login' do
-        Warden::GitHub::Rails.stub(default_scope: :foobar)
-        should_receive(:login_as).with do |_, opts|
-          expect(opts.fetch(:scope)).to eq(:foobar)
-        end
+        allow(Warden::GitHub::Rails).to receive(:default_scope) { :foobar }
 
         github_login
+
+        expect(self).to have_received(:login_as).with(
+          an_instance_of(Warden::GitHub::Rails::TestHelpers::MockUser),
+          match(scope: :foobar)
+        )
       end
     end
 
     context 'when a scope is specified' do
       it 'uses that scope to login' do
-        should_receive(:login_as).with do |_, opts|
-          expect(opts.fetch(:scope)).to eq(:admin)
-        end
-
         github_login(:admin)
-      end
-    end
-
-    it 'logs in a mock user' do
-      expected_user = nil
 
-      should_receive(:login_as).with do |user, _|
-        expected_user = user
-        expect(user).to be_a(Warden::GitHub::Rails::TestHelpers::MockUser)
+        expect(self).to have_received(:login_as).with(
+          an_instance_of(Warden::GitHub::Rails::TestHelpers::MockUser),
+          match(scope: :admin)
+        )
       end
-
-      user = github_login
-
-      expect(user).to eq(expected_user)
     end
   end
 end

data/warden-github-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/) - Dir.glob('example/**/*')
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
-  gem.add_development_dependency 'rspec', '~> 2.14'
+  gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rails', '>= 3.2'
   gem.add_development_dependency 'rack-test', '~> 0.6'
   gem.add_development_dependency 'addressable', '~> 2.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warden-github-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement