gds-sso 13.3.0 → 13.4.0

data/spec/requests/end_to_end_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'timecop'
 
-describe "Integration of client using GDS-SSO with signonotron" do
-  include Signonotron2IntegrationHelpers
+describe "Integration of client using GDS-SSO with signon" do
+  include SignonIntegrationHelpers
 
   before :all do
-    wait_for_signonotron_to_start
+    wait_for_signon_to_start
   end
 
   before :each do
@@ -15,7 +15,7 @@ describe "Integration of client using GDS-SSO with signonotron" do
     Capybara.current_driver = :mechanize
     Capybara::Mechanize.local_hosts << @client_host
 
-    load_signonotron_setup_fixture
+    load_signon_setup_fixture
   end
 
   describe "Web client accesses" do
@@ -114,7 +114,7 @@ describe "Integration of client using GDS-SSO with signonotron" do
     end
 
     describe "session expiry" do
-      it "should force you to re-authenticate with signonotron N hours after login" do
+      it "should force you to re-authenticate with signon 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"
@@ -132,7 +132,7 @@ describe "Integration of client using GDS-SSO with signonotron" do
         expect(page).to have_content("Sign in")
       end
 
-      it "should accept signonotron's remembered authentication N hours after login" do
+      it "should accept signon'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"
@@ -149,7 +149,7 @@ describe "Integration of client using GDS-SSO with signonotron" do
       end
 
 
-      it "should not require re-authentication with signonotron fewer than N hours after login" do
+      it "should not require re-authentication with signon fewer than 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"
@@ -170,7 +170,7 @@ describe "Integration of client using GDS-SSO with signonotron" do
   describe "OAuth based API client accesses" do
     before :each do
       page.driver.header 'accept', 'application/json'
-      authorize_signonotron_api_user
+      authorize_signon_api_user
 
       token = "caaeb53be5c7277fb0ef158181bfd1537b57f9e3b83eb795be3cd0af6e118b28"
       page.driver.header 'authorization', "Bearer #{token}"

data/spec/support/{signonotron2_integration_helpers.rb → signon_integration_helpers.rb}

@@ -1,22 +1,22 @@
 require 'net/http'
 
-module Signonotron2IntegrationHelpers
-  def wait_for_signonotron_to_start
+module SignonIntegrationHelpers
+  def wait_for_signon_to_start
     retries = 0
     url = GDS::SSO::Config.oauth_root_url
-    puts "Waiting for signonotron to start at #{url}"
-    while ! signonotron_started?(url)
+    puts "Waiting for signon to start at #{url}"
+    while ! signon_started?(url)
       print '.'
       if retries > 20
-        raise "Signonotron is not running at #{url}. Please start with `./start_signon.sh`. Under jenkins this should happen automatically."
+        raise "Signon is not running at #{url}. Please start with `./start_signon.sh`. Under jenkins this should happen automatically."
       end
       retries += 1
       sleep 1
     end
-    puts "Signonotron is now running at #{url}"
+    puts "Signon is now running at #{url}"
   end
 
-  def signonotron_started?(url)
+  def signon_started?(url)
     uri = URI.parse(url)
     conn = Net::HTTP.start(uri.host, uri.port)
     true
@@ -26,21 +26,21 @@ module Signonotron2IntegrationHelpers
     conn.try(:finish)
   end
 
-  def load_signonotron_setup_fixture
-    load_signonotron_fixture("signonotron2.sql")
+  def load_signon_setup_fixture
+    load_signon_fixture("signon.sql")
   end
 
-  def authorize_signonotron_api_user
-    load_signonotron_fixture("authorize_api_users.sql")
+  def authorize_signon_api_user
+    load_signon_fixture("authorize_api_users.sql")
   end
 
-  def load_signonotron_fixture(filename)
+  def load_signon_fixture(filename)
     require 'erb'
     parsed = ERB.new(File.read(signon_path + "/config/database.yml")).result
     db = YAML.load(parsed)['test']
 
     cmd = "mysql #{db['database']} -u#{db['username']} -p#{db['password']} < #{fixture_file(filename)}"
-    system cmd or raise "Error loading signonotron fixture"
+    system cmd or raise "Error loading signon fixture"
   end
 
 private
@@ -49,6 +49,6 @@ private
   end
 
   def signon_path
-    Rails.root.join('..','..','tmp','signonotron2').to_s
+    Rails.root.join('..','..','tmp','signon').to_s
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-sso
 version: !ruby/object:Gem::Version
-  version: 13.3.0
+  version: 13.4.0
 platform: ruby
 authors:
-- Matt Patterson
-- James Stewart
+- GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,8 +222,7 @@ dependencies:
         version: 0.3.5
 description: Client for GDS' OAuth 2-based SSO
 email:
-- matt@constituentparts.com
-- james.stewart@digital.cabinet-office.gov.uk
+- govuk-dev@digital.cabinet-office.gov.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -253,7 +251,7 @@ files:
 - spec/controller/api_user_controller_spec.rb
 - spec/controller/controller_methods_spec.rb
 - spec/fixtures/integration/authorize_api_users.sql
-- spec/fixtures/integration/signonotron2.sql
+- spec/fixtures/integration/signon.sql
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/example_controller.rb
 - spec/internal/app/models/user.rb
@@ -267,7 +265,7 @@ files:
 - 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/signon_integration_helpers.rb
 - spec/support/timecop.rb
 - spec/unit/api_access_spec.rb
 - spec/unit/bearer_token_spec.rb
@@ -298,26 +296,26 @@ signing_key:
 specification_version: 4
 summary: Client for GDS' OAuth 2-based SSO
 test_files:
-- spec/support/backport_controller_test_params.rb
-- spec/support/signonotron2_integration_helpers.rb
-- spec/support/timecop.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/fixtures/integration/signonotron2.sql
-- spec/fixtures/integration/authorize_api_users.sql
-- spec/controller/controller_methods_spec.rb
-- spec/controller/api_user_controller_spec.rb
-- spec/internal/log/test.log
-- spec/internal/public/favicon.ico
 - spec/internal/config/database.yml
 - spec/internal/config/initializers/gds-sso.rb
 - spec/internal/config/routes.rb
-- spec/internal/app/models/user.rb
-- spec/internal/app/controllers/example_controller.rb
+- spec/internal/public/favicon.ico
 - spec/internal/app/controllers/application_controller.rb
-- spec/internal/db/schema.rb
+- spec/internal/app/controllers/example_controller.rb
+- spec/internal/app/models/user.rb
+- spec/internal/log/test.log
 - spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/controller/api_user_controller_spec.rb
+- spec/controller/controller_methods_spec.rb
+- spec/support/timecop.rb
+- spec/support/backport_controller_test_params.rb
+- spec/support/signon_integration_helpers.rb
+- spec/fixtures/integration/signon.sql
+- spec/fixtures/integration/authorize_api_users.sql
+- spec/unit/api_access_spec.rb
+- spec/unit/session_serialisation_spec.rb
+- spec/unit/user_spec.rb
+- spec/unit/bearer_token_spec.rb
+- spec/spec_helper.rb
+- spec/requests/end_to_end_spec.rb