kensa 1.1.4 → 1.2.0rc1

data/test/sso_test.rb

@@ -1,126 +1,72 @@
-require 'test/helper'
-require 'cgi'
-
+$:.unshift(File.expand_path("../..",__FILE__))
+require 'test/lib/dependencies'
 class SsoTest < Test::Unit::TestCase
-  include Heroku::Kensa
 
-  setup do
-    @data = Manifest.new.skeleton.merge(:id => 1)
-    @data['api']['test'] = 'http://localhost:4567/'
-    @data['api']['sso_salt'] = 'SSO_SALT'
+  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
 
-  teardown { Timecop.return }
-
-  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['user'].first
+  def sso_post?
+    manifest["api"]["test"].is_a?(Hash) &&
+      manifest["api"]["test"]["sso_url"]
   end
 
-  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
+  def sso_url
+    if sso_post?
+      manifest["api"]["test"]["sso_url"].chomp("/")
+    else
+      "/heroku/resources"
     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
+  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
     end
+  end
 
-    context 'when sso method is POST' do
-      setup do
-        Timecop.freeze Time.utc(2010, 1)
-        @data['api']['sso'] = 'post'
-      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/heroku/resources/1/sso", @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/heroku/resources/1/sso via proxy on port #{@sso.proxy_port}", @sso.message
-        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
+  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 a specific environment' 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  
+    puts "Hello"
+    puts response.cookies.inspect
 
-      @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."
+  end
 
-    test 'builds full url' do
-      builds_full_url('production')
-    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."
   end
 end

metadata

@@ -1,220 +1,162 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kensa
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 4
-  version: 1.1.4
+version: !ruby/object:Gem::Version
+  version: 1.2.0rc1
+  prerelease: 5
 platform: ruby
-authors: 
+authors:
 - Blake Mizerany
 - Pedro Belo
 - Adam Wiggins
 - Chris Continanza
+- Glenn Gillen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-22 00:00:00 -07:00
-default_executable: kensa
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: turn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+date: 2011-10-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70119858551140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: contest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70119858551140
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70119858550340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.6
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
+  version_requirements: *70119858550340
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70119858549300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+  version_requirements: *70119858549300
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70119858548460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70119858548460
+- !ruby/object:Gem::Dependency
+  name: artifice
+  requirement: &70119858547540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: contest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70119858547540
+- !ruby/object:Gem::Dependency
   name: haml
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70119858546680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.3
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rr
+  version_requirements: *70119858546680
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70119858545920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70119858545920
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 0
-        version: 1.7.0
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
+  requirement: &70119858545100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70119858545100
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70119858544180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70119858544180
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &70119858543480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
+  version_requirements: *70119858543480
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70119858542700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.5
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: mechanize
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70119858542700
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: &70119858541620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id014
-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: pedro@heroku.com
-executables: 
+  prerelease: false
+  version_requirements: *70119858541620
+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
+executables:
 - kensa
 extensions: []
-
-extra_rdoc_files: 
-- README.md
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -222,54 +164,63 @@ files:
 - bin/kensa
 - kensa.gemspec
 - lib/heroku/kensa.rb
-- lib/heroku/kensa/check.rb
 - lib/heroku/kensa/client.rb
 - lib/heroku/kensa/http.rb
 - lib/heroku/kensa/manifest.rb
 - lib/heroku/kensa/post_proxy.rb
 - lib/heroku/kensa/sso.rb
+- lib/heroku/kensa/version.rb
 - set-env.sh
-- test/all_check_test.rb
-- test/deprovision_check_test.rb
+- test/deprovision_test.rb
 - test/helper.rb
-- test/manifest_check_test.rb
+- test/lib/dependencies.rb
+- test/lib/formatter.rb
+- test/lib/response.rb
+- test/lib/test_case.rb
+- test/manifest_generation_test.rb
 - test/manifest_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/plan_change_test.rb
+- test/provision_test.rb
+- test/resources/provider_server.rb
+- test/resources/views/index.haml
+- test/sso_launch_test.rb
 - test/sso_test.rb
-has_rdoc: true
 homepage: http://provider.heroku.com/resources
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: kensa
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Tool to help Heroku add-on providers integrating their services
-test_files: []
-
+test_files:
+- test/deprovision_test.rb
+- test/helper.rb
+- test/lib/dependencies.rb
+- test/lib/formatter.rb
+- test/lib/response.rb
+- test/lib/test_case.rb
+- test/manifest_generation_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/sso_test.rb