gds-sso 11.0.0 → 11.1.0

data/spec/support/signonotron2_integration_helpers.rb

@@ -34,13 +34,19 @@ module Signonotron2IntegrationHelpers
     load_signonotron_fixture("authorize_api_users.sql")
   end
 
-  def load_signonotron_fixture(fixture_sql_file)
-    fixtures_path = Pathname.new(File.join(File.dirname(__FILE__), '../fixtures/integration'))
-    app = "signonotron2"
-    path_to_app = Rails.root.join('..','..','tmp',app)
+  def load_signonotron_fixture(filename)
+    db = YAML.load_file(signon_path + "/config/database.yml")['test']
 
-    db = YAML.load_file(fixtures_path + "#{app}_database.yml")['test']
-    cmd = "sqlite3 #{path_to_app + db['database']} < #{fixtures_path + "#{fixture_sql_file}"}"
+    cmd = "mysql #{db['database']} -u#{db['username']} -p#{db['password']} < #{fixture_file(filename)}"
     system cmd or raise "Error loading signonotron fixture"
   end
+
+private
+  def fixture_file(filename)
+    File.join(File.dirname(__FILE__), '../fixtures/integration', filename)
+  end
+
+  def signon_path
+    Rails.root.join('..','..','tmp','signonotron2').to_s
+  end
 end

data/spec/tasks/signonotron_tasks.rake

@@ -18,6 +18,13 @@ namespace :signonotron do
       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
@@ -30,10 +37,12 @@ namespace :signonotron do
         "/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"}`
-      FileUtils.cp gem_root.join('spec', 'fixtures', 'integration', "#{@app_to_launch}_database.yml"), File.join('config', 'database.yml')
       puts `#{env_stuff} bundle exec rake db:drop db:create db:schema:load`
 
       puts "Starting signonotron instance in the background"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-sso
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.1.0
 platform: ruby
 authors:
 - Matt Patterson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -235,20 +235,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.5
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Client for GDS' OAuth 2-based SSO
 email:
 - matt@constituentparts.com
@@ -280,7 +266,6 @@ files:
 - spec/controller/api_user_controller_spec.rb
 - spec/fixtures/integration/authorize_api_users.sql
 - spec/fixtures/integration/signonotron2.sql
-- spec/fixtures/integration/signonotron2_database.yml
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/example_controller.rb
 - spec/internal/app/models/user.rb
@@ -319,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gds-sso
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Client for GDS' OAuth 2-based SSO
@@ -335,7 +320,6 @@ test_files:
 - spec/tasks/signonotron_tasks.rake
 - spec/fixtures/integration/signonotron2.sql
 - spec/fixtures/integration/authorize_api_users.sql
-- spec/fixtures/integration/signonotron2_database.yml
 - spec/internal/log/test.log
 - spec/internal/db/schema.rb
 - spec/internal/db/combustion_test.sqlite

data/spec/fixtures/integration/signonotron2_database.yml

@@ -1,5 +0,0 @@
-test: &test
-   adapter: sqlite3
-   database: db/test.sqlite3
-   pool: 5
-   timeout: 5000