kensa 1.2.0rc7 → 1.2.0

data/test/sso_test.rb

@@ -1,70 +1,130 @@
-$:.unshift(File.expand_path("../..",__FILE__))
-require 'test/lib/dependencies'
+require 'test/helper'
+require 'cgi'
+
 class SsoTest < Test::Unit::TestCase
+  include Heroku::Kensa
 
-  def setup
-    super
-    @user_id ||= manifest["user_id"] || 123
-    @time = Time.now.to_i
-    @params = { :timestamp => @time,
-                :token => make_token(@user_id, manifest['api']["sso_salt"], @time.to_s),
-                "nav-data" => "some-nav-data"
-              }
-  end
+  context "with GET" do
+    setup do
+      @data = Manifest.new.skeleton.merge(:id => 1)
+      @data['api']['test'] = 'http://localhost:4567/'
+      @data['api']['sso_salt'] = 'SSO_SALT'
+    end
 
-  def sso_post?
-    manifest["api"]["test"].is_a?(Hash) &&
-      manifest["api"]["test"]["sso_url"]
-  end
+    teardown { Timecop.return }
 
-  def sso_url
-    if sso_post?
-      manifest["api"]["test"]["sso_url"].chomp("/")
-    else
-      "/heroku/resources"
+    def builds_full_url(env)
+      url, query = @sso.full_url.split('?')
+      data = CGI.parse(query)
+
+
+      assert_equal "#{@data['api'][env]}heroku/resources/1", url 
+      assert_equal 'b6010f6fbb850887a396c2bc0ab23974003008f6', data['token'].first
+      assert_equal '1262304000', data['timestamp'].first
+      assert_equal 'username@example.com', data['email'].first
     end
-  end
 
-  def sso_login(params = @params, user_id = @user_id)
-    if sso_post?
-      post sso_url, params.merge(:id => user_id)
-    else
-      get "#{sso_url}/#{user_id}", params
+    context 'sso' do
+      setup do
+        Timecop.freeze Time.utc(2010, 1)
+        @sso = Sso.new @data 
+      end
+
+      test 'builds path' do
+        assert_equal '/heroku/resources/1', @sso.path
+      end
+
+      test 'builds full url' do
+        builds_full_url('test')
+      end
+
+      context 'with no "sso" field specified' do
+        test "defaults to GET" do
+          assert_equal @sso.full_url, @sso.sso_url
+        end
+      end
+
+      context 'when sso method is GET' do
+        setup do
+          @data['api']['sso'] = 'GET'
+          @sso = Sso.new(@data).start
+        end
+
+        test "#sso_url should be the #full_url" do
+          assert_equal @sso.full_url, @sso.sso_url
+        end
+
+        test "#message is Opening <full_url>" do
+          assert_equal "Opening #{@sso.full_url}", @sso.message
+        end
+      end
+
     end
-  end
 
-  def test_validates_token
-    @params[:token] = "foo"
-    response = sso_login
-    assert_equal 403, response.code, "Signing in via SSO at /heroku/resources/:id must return a 403 if the token is invalid."
-  end
+    context 'sso without salt' do
+      setup do
+        @data['api'].delete 'sso_salt'
+        @sso = Sso.new @data
+      end
 
-  def test_validates_timestamp
-    @params[:timestamp] = (Time.now-60*3).to_i
-    @params[:token] = make_token(123, "SSO_SALT", @params[:timestamp].to_s)
-    response = sso_login
-    assert_equal 403, response.code, "Signing in via SSO at /heroku/resources/:id must return a 403 if the timestamp is expired."
+      test 'builds full url' do
+        expected = 'http://localhost:4567/heroku/resources/1'
 
-    @params[:timestamp] = "foo"
-    response = sso_login
-    assert_equal 403, response.code, "Signing in via SSO at /heroku/resources/:id must return a 403 if the timestamp is invalid."
-  end
+        assert @sso.full_url.include?(expected)
+      end
+    end
 
-  def test_logs_in
-    response = sso_login
-    assert response.code.to_s.match(/\A2/), "Signing in via SSO at /heroku/resources/:id must return a 2xx response if sign in was valid."
-  end
+    context 'sso in production' do
+      setup do
+        Timecop.freeze Time.utc(2010, 1)
+        env = 'production'
+        @data[:env] = env
+        @data['api'][env] = 'http://localhost:7654/'
 
-  def test_creates_the_heroku_nav_data_cookie
-    response = sso_login  
+        @sso = Sso.new @data
+      end
 
-    assert response.cookies, "SSO sign in should set the heroku-nav-data cookie to the value of the passed nav-data parameter."
-    assert_equal @params["nav-data"], response.cookies["heroku-nav-data"], "SSO sign in should set the heroku-nav-data cookie to the value of the passed nav-data parameter."
+      test 'builds full url' do
+        builds_full_url('production')
+      end
+    end
   end
 
-  def test_displays_the_heroku_layout
-    response = sso_login
-    document = Nokogiri::HTML.parse(response.body)
-    assert !document.search("div#heroku-header").empty?, "Logged in page should contain the Heroku header."
+  context "via POST" do
+    setup do
+      Timecop.freeze Time.utc(2010, 1)
+      @data = Manifest.new(:method => :post).skeleton.merge(:id => 1)
+      @data['api']['sso_salt'] = 'SSO_SALT'
+    end
+
+    test "it starts the proxy server" do
+      @sso = Sso.new(@data).start
+      body = RestClient.get(@sso.sso_url)
+
+      assert body.include? @sso.path
+      assert body.include? 'b6010f6fbb850887a396c2bc0ab23974003008f6'
+      assert body.include? '1262304000'
+      assert body.include? @sso.url
+      assert body.include? @sso.sample_nav_data
+    end
+
+    context "with the proxy working" do
+      setup do 
+        any_instance_of(Sso, :run_proxy => false)
+        @sso = Sso.new(@data).start
+      end
+
+      test "#sso_url should point to the proxy" do
+        assert_equal "http://localhost:#{@sso.proxy_port}/", @sso.sso_url
+      end
+
+      test "#post_url contains url and path" do
+        assert_equal "http://localhost:4567/sso/login", @sso.post_url
+      end
+
+      test "#message is Posting <data> to <post_url> via proxy on port <proxy_port>" do
+        assert_equal "POSTing #{@sso.query_data} to http://localhost:4567/sso/login via proxy on port #{@sso.proxy_port}", @sso.message
+      end
+    end
   end
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 1.2.0rc7
-  prerelease: 5
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Blake Mizerany
 - Pedro Belo
 - Adam Wiggins
-- Chris Continanza
 - Glenn Gillen
+- Chris Continanza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-25 00:00:00.000000000Z
+date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70357298670540 !ruby/object:Gem::Requirement
+  name: contest
+  requirement: &70130076419400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,120 +25,134 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357298670540
+  version_requirements: *70130076419400
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70357298669740 !ruby/object:Gem::Requirement
+  name: timecop
+  requirement: &70130076416540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70357298669740
+  version_requirements: *70130076416540
 - !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: &70357298668860 !ruby/object:Gem::Requirement
+  name: sinatra
+  requirement: &70130076414660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70357298668860
+  version_requirements: *70130076414660
 - !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70357298668060 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70130076412640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357298668060
+  version_requirements: *70130076412640
 - !ruby/object:Gem::Dependency
-  name: artifice
-  requirement: &70357298667400 !ruby/object:Gem::Requirement
+  name: contest
+  requirement: &70130076411500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357298667400
+  version_requirements: *70130076411500
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70357298665960 !ruby/object:Gem::Requirement
+  requirement: &70130076410000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357298665960
+  version_requirements: *70130076410000
 - !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: &70357298665280 !ruby/object:Gem::Requirement
+  name: rr
+  requirement: &70130076408820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.3
-  type: :runtime
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70130076408820
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70130076407080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70357298665280
+  version_requirements: *70130076407080
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70357298664240 !ruby/object:Gem::Requirement
+  requirement: &70130076404080 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70357298664240
+  version_requirements: *70130076404080
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70357298662400 !ruby/object:Gem::Requirement
+  requirement: &70130076399200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70357298662400
+  version_requirements: *70130076399200
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70357298661220 !ruby/object:Gem::Requirement
+  requirement: &70130076396960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357298661220
+  version_requirements: *70130076396960
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70357298659880 !ruby/object:Gem::Requirement
+  requirement: &70130076393800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70357298659880
+  version_requirements: *70130076393800
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70357298658860 !ruby/object:Gem::Requirement
+  requirement: &70130076392720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -146,22 +160,11 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70357298658860
-- !ruby/object:Gem::Dependency
-  name: artifice
-  requirement: &70357298657560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70357298657560
+  version_requirements: *70130076392720
 description: Kensa is a command-line tool to help add-on providers integrating their
   services with Heroku. It manages manifest files, and provides a TDD-like approach
   for programmers to test and develop their APIs.
-email: glenn@heroku.com
+email: pedro@heroku.com
 executables:
 - kensa
 extensions: []
@@ -175,28 +178,29 @@ files:
 - bin/kensa
 - kensa.gemspec
 - lib/heroku/kensa.rb
+- lib/heroku/kensa/check.rb
 - lib/heroku/kensa/client.rb
+- lib/heroku/kensa/git.rb
 - lib/heroku/kensa/http.rb
 - lib/heroku/kensa/manifest.rb
 - lib/heroku/kensa/post_proxy.rb
+- lib/heroku/kensa/screen.rb
 - lib/heroku/kensa/sso.rb
 - lib/heroku/kensa/version.rb
 - set-env.sh
-- test.rb
+- test/all_check_test.rb
 - test/create_test.rb
-- test/deprovision_test.rb
+- test/deprovision_check_test.rb
 - test/helper.rb
-- test/lib/dependencies.rb
-- test/lib/formatter.rb
-- test/lib/http.rb
-- test/lib/response.rb
-- test/manifest_generation_test.rb
+- test/init_test.rb
+- test/manifest_check_test.rb
 - test/manifest_test.rb
-- test/plan_change_test.rb
-- test/provision_test.rb
-- test/resources/provider_server.rb
-- test/resources/views/index.haml
-- test/sso_launch_test.rb
+- test/plan_change_check_test.rb
+- test/provision_check_test.rb
+- test/provision_response_check_test.rb
+- test/resources/runner.rb
+- test/resources/server.rb
+- test/sso_check_test.rb
 - test/sso_test.rb
 homepage: http://provider.heroku.com/resources
 licenses: []
@@ -212,13 +216,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2597895003724042539
+      hash: 3834118791582110421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3834118791582110421
 requirements: []
 rubyforge_project: kensa
 rubygems_version: 1.8.10
@@ -226,18 +233,17 @@ signing_key:
 specification_version: 3
 summary: Tool to help Heroku add-on providers integrating their services
 test_files:
+- test/all_check_test.rb
 - test/create_test.rb
-- test/deprovision_test.rb
+- test/deprovision_check_test.rb
 - test/helper.rb
-- test/lib/dependencies.rb
-- test/lib/formatter.rb
-- test/lib/http.rb
-- test/lib/response.rb
-- test/manifest_generation_test.rb
+- test/init_test.rb
+- test/manifest_check_test.rb
 - test/manifest_test.rb
-- test/plan_change_test.rb
-- test/provision_test.rb
-- test/resources/provider_server.rb
-- test/resources/views/index.haml
-- test/sso_launch_test.rb
+- test/plan_change_check_test.rb
+- test/provision_check_test.rb
+- test/provision_response_check_test.rb
+- test/resources/runner.rb
+- test/resources/server.rb
+- test/sso_check_test.rb
 - test/sso_test.rb