gds-sso 12.1.0 → 13.0.0

data/spec/requests/end_to_end_spec.rb

@@ -123,11 +123,29 @@ describe "Integration of client using GDS-SSO with signonotron" do
 
         expect(page).to have_content('restricted kablooie')
 
+        visit "http://localhost:4567/users/sign_out"
+
+        Timecop.travel(Time.now.utc + GDS::SSO::Config.auth_valid_for + 5.minutes) do
+          visit "http://#{@client_host}/restricted"
+        end
+
+        expect(page).to have_content("Sign in")
+      end
+
+      it "should accept signonotron's remembered authentication N hours after login" do
+        visit "http://#{@client_host}/restricted"
+        expect(page).to have_content("Sign in")
+        fill_in "Email", :with => "test@example-client.com"
+        fill_in "Passphrase", :with => "q1w2e3r4t5y6u7i8o9p0"
+        click_on "Sign in"
+
+        expect(page).to have_content('restricted kablooie')
+
         Timecop.travel(Time.now.utc + GDS::SSO::Config.auth_valid_for + 5.minutes) do
           visit "http://#{@client_host}/restricted"
         end
 
-        expect(page.driver.request.referrer).to match(%r(\Ahttp://#{@client_host}/auth/gds/callback))
+        expect(page).to have_content("restricted kablooie")
       end
 
 
@@ -144,7 +162,7 @@ describe "Integration of client using GDS-SSO with signonotron" do
           visit "http://#{@client_host}/restricted"
         end
 
-        expect(page.driver.request.referrer).to match(%r(\Ahttp://#{@client_host}/restricted))
+        expect(page).to have_content("restricted kablooie")
       end
     end
   end

data/spec/spec_helper.rb

@@ -15,8 +15,9 @@ require 'capybara/mechanize'
 
 include Warden::Test::Helpers
 
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
+
 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
 
@@ -25,6 +26,6 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-end
 
-Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
+  config.include(BackportControllerTestParams) if Rails.version < '5'
+end

data/spec/support/backport_controller_test_params.rb

@@ -0,0 +1,21 @@
+module BackportControllerTestParams
+  def delete(*args)
+    action, rest = *args
+    super(action, rest[:params])
+  end
+
+  def get(*args)
+    action, rest = *args
+    super(action, rest[:params])
+  end
+
+  def post(*args)
+    action, rest = *args
+    super(action, rest[:params])
+  end
+
+  def put(*args)
+    action, rest = *args
+    super(action, rest[:params])
+  end
+end

data/spec/unit/api_access_spec.rb

@@ -6,10 +6,12 @@ describe GDS::SSO::ApiAccess do
     ie7_accept_header = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, ' +
       'application/x-shockwave-flash, application/xaml+xml, application/x-ms-xbap, ' +
       'application/x-ms-application, */*'
-    expect(GDS::SSO::ApiAccess.api_call?('HTTP_ACCEPT' => ie7_accept_header)).to be_false
+    expect(GDS::SSO::ApiAccess.api_call?('HTTP_ACCEPT' => ie7_accept_header)).to be_falsey
   end
 
-  it "should consider a json accept header to be an api call" do
-    expect(GDS::SSO::ApiAccess.api_call?('HTTP_ACCEPT' => 'application/json')).to be_true
+  context "with a bearer token" do
+    it "it is considered an api call" do
+      expect(GDS::SSO::ApiAccess.api_call?('HTTP_AUTHORIZATION' => 'Bearer deadbeef12345678')).to be_truthy
+    end
   end
 end

data/spec/unit/bearer_token_spec.rb

@@ -4,16 +4,6 @@ require 'gds-sso/bearer_token'
 describe GDS::SSO::BearerToken do
   describe '.locate' do
     it 'creates a new user for a token' do
-      response = {
-        user: {
-          uid: 'asd',
-          email: 'user@example.com',
-          name: 'A Name',
-          permissions: ['signin'],
-          organisation_slug: 'hmrc',
-          organisation_content_id: '67a2b78d-eee3-45b3-80e2-792e7f71cecc',
-        }
-      }
       response = double(body: {
         user: {
           uid: 'asd',

data/spec/unit/session_serialisation_spec.rb

@@ -26,7 +26,7 @@ describe Warden::SessionSerializer do
     end
 
     it "should return nil if the user has no uid" do
-      @user.stub(:uid).and_return(nil)
+      allow(@user).to receive(:uid).and_return(nil)
       result = @serializer.serialize(@user)
 
       expect(result).to be_nil

data/spec/unit/user_spec.rb

@@ -56,6 +56,10 @@ describe GDS::SSO::User do
       def remotely_signed_out?
         remotely_signed_out
       end
+
+      def disabled?
+        disabled
+      end
     end
 
     let(:described_class) { TestUser }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-sso
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 13.0.0
 platform: ruby
 authors:
 - Matt Patterson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.4
 - !ruby/object:Gem::Dependency
   name: warden
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +95,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: rack-accept
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -143,56 +129,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: capybara-mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -279,9 +265,9 @@ files:
 - spec/internal/public/favicon.ico
 - spec/requests/end_to_end_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_controller_test_params.rb
 - spec/support/signonotron2_integration_helpers.rb
 - spec/support/timecop.rb
-- spec/tasks/signonotron_tasks.rake
 - spec/unit/api_access_spec.rb
 - spec/unit/bearer_token_spec.rb
 - spec/unit/session_serialisation_spec.rb
@@ -298,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -311,25 +297,25 @@ signing_key:
 specification_version: 4
 summary: Client for GDS' OAuth 2-based SSO
 test_files:
-- spec/controller/api_user_controller_spec.rb
-- spec/unit/user_spec.rb
-- spec/unit/api_access_spec.rb
-- spec/unit/session_serialisation_spec.rb
-- spec/unit/bearer_token_spec.rb
+- spec/requests/end_to_end_spec.rb
 - spec/spec_helper.rb
-- spec/support/timecop.rb
+- spec/support/backport_controller_test_params.rb
 - spec/support/signonotron2_integration_helpers.rb
-- spec/internal/app/controllers/example_controller.rb
-- spec/internal/app/controllers/application_controller.rb
+- spec/support/timecop.rb
 - spec/internal/app/models/user.rb
-- spec/internal/log/test.log
-- spec/internal/public/favicon.ico
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/example_controller.rb
+- spec/internal/config/routes.rb
 - spec/internal/config/initializers/gds-sso.rb
 - spec/internal/config/database.yml
-- spec/internal/config/routes.rb
 - spec/internal/db/schema.rb
 - spec/internal/db/combustion_test.sqlite
-- spec/requests/end_to_end_spec.rb
+- spec/internal/public/favicon.ico
+- spec/internal/log/test.log
+- spec/controller/api_user_controller_spec.rb
+- spec/unit/user_spec.rb
+- spec/unit/bearer_token_spec.rb
+- spec/unit/session_serialisation_spec.rb
+- spec/unit/api_access_spec.rb
 - spec/fixtures/integration/signonotron2.sql
 - spec/fixtures/integration/authorize_api_users.sql
-- spec/tasks/signonotron_tasks.rake

data/spec/tasks/signonotron_tasks.rake

@@ -1,65 +0,0 @@
-namespace :signonotron do
-  desc "Start signonotron (for integration tests)"
-  task :start => :stop do
-
-    @app_to_launch = "signonotron2"
-
-    puts "Launching: #{@app_to_launch}"
-
-    gem_root = Pathname.new(File.dirname(__FILE__)) + '..' + '..'
-    FileUtils.mkdir_p(gem_root + 'tmp')
-    Dir.chdir gem_root + 'tmp' do
-      if File.exist? @app_to_launch
-        Dir.chdir @app_to_launch do
-          puts `git clean -fdx`
-          puts `git fetch origin`
-          puts `git reset --hard origin/master`
-        end
-      else
-        puts `git clone git@github.com:alphagov/#{@app_to_launch}`
-      end
-
-      if signon_commitish = ENV['SIGNON_COMMITISH']
-        puts "Checking out non-master of signon: #{signon_commitish}"
-        Dir.chdir(@app_to_launch) do
-          system `git checkout #{signon_commitish}` || raise("Unable to checkout #{signon_commitish}")
-        end
-      end
-    end
-
-    Dir.chdir gem_root + 'tmp' + @app_to_launch do
-      env_to_clear = %w(BUNDLE_GEMFILE BUNDLE_BIN_PATH RUBYOPT GEM_HOME GEM_PATH RBENV_VERSION)
-
-      env_stuff = case `uname`.strip
-      when "Darwin"
-        env_to_clear.map { |e| "unset #{e}" }.join(" && ") + " && "
-      else
-        "/usr/bin/env " + env_to_clear.map { |e| "-u #{e}" }.join(" ")
-      end
-      env_stuff += " RAILS_ENV=test"
-      if ENV.has_key?('ORIGINAL_PATH')
-        env_stuff += " PATH=#{ENV.fetch('ORIGINAL_PATH')}"
-      end
-
-      puts "Running bundler"
-      puts `#{env_stuff} bundle install --path=#{gem_root + 'tmp' + "#{@app_to_launch}_bundle"}`
-      puts `#{env_stuff} bundle exec rake db:drop db:create db:schema:load`
-
-      puts "Starting signonotron instance in the background"
-      fork do
-        Process.daemon(true)
-        exec "#{env_stuff} bundle exec rails s -p 4567"
-      end
-    end
-  end
-
-  desc "Stop running signonotron (for integration tests)"
-  task :stop do
-    pid_output = `lsof -Fp -i :4567`.chomp
-    if pid_output =~ /\Ap(\d+)\z/
-      puts "Stopping running instance of Signonotron (pid #{$1})"
-      Process.kill(:INT, $1.to_i)
-    end
-  end
-end
-