gds-sso 9.3.0 → 9.4.0

data/spec/spec_helper.rb

@@ -1,20 +1,15 @@
-require 'rubygems'
-require 'bundler'
-
 # Yes, we really do want to turn off the test environment check here.
 # Bad things happen if we don't ;-)
 ENV['GDS_SSO_STRATEGY'] = 'real'
 
-Bundler.require :default
-
-require 'capybara/rspec'
+require 'bundler/setup'
 require 'combustion'
+require 'capybara/rspec'
 
 Combustion.initialize! :all
 
 require 'rspec/rails'
 require 'capybara/rails'
-
 require 'mechanize'
 require 'capybara/mechanize'
 

data/spec/unit/session_serialisation_spec.rb

@@ -2,15 +2,14 @@ require 'spec_helper'
 require 'active_record'
 
 describe Warden::SessionSerializer do
-  class User < ActiveRecord::Base
+  class SerializableUser
     include GDS::SSO::User
-
   end
 
   before :each do
     @old_user_model = GDS::SSO::Config.user_model
-    GDS::SSO::Config.user_model = User
-    @user = double("User", uid: 1234)
+    GDS::SSO::Config.user_model = SerializableUser
+    @user = double("SerializableUser", uid: 1234)
     @serializer = Warden::SessionSerializer.new(nil)
   end
   after :each do
@@ -36,7 +35,7 @@ describe Warden::SessionSerializer do
 
   describe "deserialize a user" do
     it "should return the user if the timestamp is current and a Time" do
-      expect(User).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
+      expect(SerializableUser).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
 
       result = @serializer.deserialize [1234, Time.now.utc - GDS::SSO::Config.auth_valid_for + 3600]
 
@@ -44,7 +43,7 @@ describe Warden::SessionSerializer do
     end
 
     it "should return the user if the timestamp is current and is an ISO 8601 string" do
-      expect(User).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
+      expect(SerializableUser).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
 
       result = @serializer.deserialize [1234, (Time.now.utc - GDS::SSO::Config.auth_valid_for + 3600).iso8601]
 
@@ -52,7 +51,7 @@ describe Warden::SessionSerializer do
     end
 
     it "should return nil if the timestamp is out of date" do
-      expect(User).not_to receive(:where)
+      expect(SerializableUser).not_to receive(:where)
 
       result = @serializer.deserialize [1234, Time.now.utc - GDS::SSO::Config.auth_valid_for - 3600]
 
@@ -60,7 +59,7 @@ describe Warden::SessionSerializer do
     end
 
     it "should return nil for a user without a timestamp" do
-      expect(User).not_to receive(:where)
+      expect(SerializableUser).not_to receive(:where)
 
       result = @serializer.deserialize 1234
 
@@ -68,7 +67,7 @@ describe Warden::SessionSerializer do
     end
 
     it "should return nil for a user with a badly formatted timestamp" do
-      expect(User).not_to receive(:where)
+      expect(SerializableUser).not_to receive(:where)
 
       result = @serializer.deserialize [1234, 'this is not a timestamp']
 

data/spec/unit/user_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper'
 require 'gds-sso/user'
+require 'gds-sso/lint/user_spec'
+
+require 'ostruct'
 
 describe GDS::SSO::User do
   before :each do
@@ -16,4 +19,35 @@ describe GDS::SSO::User do
     expected = {'uid' => 'abcde', 'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk', "permissions" => [], "organisation_slug" => nil}
     expect(GDS::SSO::User.user_params_from_auth_hash(@auth_hash)).to eq(expected)
   end
+
+  context "making sure that the lint spec is valid" do
+    class TestUser < OpenStruct
+      include GDS::SSO::User
+
+      def self.where(opts)
+        []
+      end
+
+      def self.create!(options, scope = {})
+        new(options)
+      end
+
+      def update_attribute(key, value)
+        send("#{key}=".to_sym, value)
+      end
+
+      def update_attributes(options)
+        options.each do |key, value|
+          update_attribute(key, value)
+        end
+      end
+
+      def remotely_signed_out?
+        remotely_signed_out
+      end
+    end
+
+    let(:described_class) { TestUser }
+    it_behaves_like "a gds-sso user class"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-sso
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -211,7 +211,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +243,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client for GDS' OAuth 2-based SSO
 email:
 - matt@constituentparts.com
@@ -289,6 +305,7 @@ files:
 - lib/gds-sso/config.rb
 - lib/gds-sso/failure_app.rb
 - lib/gds-sso/warden_config.rb
+- lib/gds-sso/lint/user_spec.rb
 - lib/gds-sso/user.rb
 - lib/gds-sso/api_access.rb
 - lib/gds-sso.rb
@@ -332,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -273519884690560048
+      hash: 21293373726415033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -341,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -273519884690560048
+      hash: 21293373726415033
 requirements: []
 rubyforge_project: gds-sso
 rubygems_version: 1.8.23