spec/helpers/app.rb spec/helpers/fixtures.rb spec/helpers/matchers.rb @@ -10,7 +10,7 @@ gem 'rack-contrib', '~>0.9.2', :require_as => [ ] gem 'json' only :test do - gem 'rack-test', '=0.3.0', :require_as => 'rack/test' + gem 'rack-test', '~>0.5.0', :require_as => 'rack/test' gem 'webrat', '~>0.5.0' gem 'rspec', '~>1.2.9', :require_as => 'spec' gem 'rake' Gemfile @@ -4,24 +4,25 @@ Feature: Logging In to an SSO Account Background: Given a valid consumer and user exists - Scenario: logging in + Scenario: I am not logged in and I (GET /) When I request the landing page Then I should be prompted to login When I login Then I am greeted - Scenario: logging in as a redirect from a consumer + Scenario: I am not logged in and redirected from a consumer When I request authentication returning to the consumer app Then I should be prompted to login When I login Then I should be redirected to the consumer app to start the handshake - Scenario: logging in + Scenario: I am not logged in and I (GET /sso/login) When I request the login page + Then I should be prompted to login When I login Then I am greeted - Scenario: logging in with a bad return_to cookie set + Scenario: I am not logged in and redirected from an unauthorized consumer Then I login When I request the login page Then I am greeted features/sessions.feature @@ -6,7 +6,8 @@ Then \ click_button 'Login' end -Then /^I can login as the new user$/ do +Then \ + /^I can login as the new user$/ do Then "I login" Then "I am greeted" end features/step_definitions/forms.rb @@ -23,20 +23,5 @@ end Then \ /^I am greeted$/ do - last_response.should have_selector("h2:contains('#{@user.first_name} #{@user.last_name}')") -end - -Then \ - /^I should be redirected to the consumer app with openid params$/ do - last_response.should be_a_redirect_to_the_consumer(@consumer, @user) -end - -Then \ - /^I should receive an associate response from the sso server$/ do - last_response.should be_an_openid_associate_response(@openid_session) -end - -Then \ - /^I should not be redirected to the consumer app with openid params$/ do - last_response.status.should eql(403) + last_response.should have_selector("h3:contains('Hello #{@user.full_name}')") end features/step_definitions/html.rb @@ -17,8 +17,3 @@ When \ } visit "/sso", :get, params end - -When \ - /^I click signup$/ do - visit "/sso/signup" -end features/step_definitions/requests.rb @@ -1,4 +1,5 @@ -Given /^a valid consumer and user exists$/ do +Given \ + /^a valid consumer and user exists$/ do @consumer = ::Hancock::Consumer.gen(:internal) @user = ::Hancock::User.gen end features/step_definitions/sessions_steps.rb @@ -1,11 +1,6 @@ class MySweetSSOServer < Hancock::App - set :provider_name, 'Example SSO Provider' - set :do_not_reply, 'sso@example.com' - set :smtp, { } - set :environment, 'production' - get '/' do redirect '/sso/login' unless session_user - erb "<h2>Hello <%= session_user.full_name %><!-- <%= session.inspect %>" + erb "<h3>Hello <%= session_user.full_name %></h3><!-- <%= session.inspect %>" end end features/support/app.rb @@ -1,17 +1,4 @@ -Bundler.require_env(:test) -require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'hancock') - -require File.join(File.dirname(__FILE__), 'app') -require File.join(File.dirname(__FILE__), '..', '..', 'spec', 'fixtures') -require File.join(File.dirname(__FILE__), '..', '..', 'spec', 'matchers') - -DataMapper.setup(:default, 'sqlite3::memory:') - -Webrat.configure do |config| - config.mode = :rack - config.application_framework = :rack - config.application_port = 4567 -end +require File.join(File.dirname(__FILE__), '..', '..', 'spec', 'spec_helper') World do def app features/support/env.rb @@ -1,19 +1,13 @@ -Bundler.require_env(:test) -require File.join(File.dirname(__FILE__), '..', 'lib', 'hancock') require 'pp' -require 'spec' -require 'randexp' -require 'dm-sweatshop' - -require 'webrat' -require 'rack/test' +Bundler.require_env(:test) +project_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) -require File.expand_path(File.dirname(__FILE__) + '/app') -require File.expand_path(File.dirname(__FILE__) + '/matchers') -require File.expand_path(File.dirname(__FILE__) + '/fixtures') +require File.join(project_root, 'lib', 'hancock') +%w(app matchers fixtures).each do |helper| + require File.join(project_root, 'spec', 'helpers', helper) +end DataMapper.setup(:default, 'sqlite3::memory:') -DataMapper.auto_migrate! Webrat.configure do |config| config.mode = :rack @@ -21,13 +15,11 @@ Webrat.configure do |config| config.application_port = 4567 end -Hancock::App.set :do_not_reply, 'sso@example.com' - Spec::Runner.configure do |config| def app @app = Rack::Builder.app do use Rack::Session::Cookie - run Hancock::App + run Sinatra::SsoServer end end spec/spec_helper.rb @@ -14,7 +14,7 @@ describe "visiting /" do login(@user) get '/' - last_response.body.to_s.should have_selector("h3:contains('Hello #{@user.first_name} #{@user.last_name}')") + last_response.body.to_s.should have_selector("h2:contains('Hello #{@user.first_name} #{@user.last_name}')") last_response.body.to_s.should have_selector("ul#consumers li a[href='#{@first.url}']:contains('#{@first.label}')") last_response.body.to_s.should have_selector("ul#consumers li a[href='#{@last.url}']:contains('#{@last.label}')") end @@ -27,7 +27,7 @@ describe "visiting /" do login(@user) get '/' - last_response.body.to_s.should have_selector("h3:contains('Hello #{@user.first_name} #{@user.last_name}')") + last_response.body.to_s.should have_selector("h2:contains('Hello #{@user.first_name} #{@user.last_name}')") last_response.body.to_s.should have_selector("ul#consumers li a[href='#{@first.url}']:contains('#{@first.label}')") last_response.body.to_s.should_not have_selector("ul#consumers li a[href='#{@last.url}']:contains('#{@last.label}')") end spec/units/landing_page_spec.rb features/sso.feature features/step_definitions/openid.rb features/step_definitions/sso_steps.rb spec/app.rb spec/fixtures.rb spec/matchers.rb 2735cda3e24a5d5ea76ac34e3d09975e9bc6cb86 Corey Donohoe atmos@atmos.org http://github.com/atmos/hancock/commit/85f7dbadb628e07fb054ccf4c3da5134b1c7096c 85f7dbadb628e07fb054ccf4c3da5134b1c7096c 2009-10-30T00:43:35-07:00 2009-10-30T00:43:35-07:00 removing, renaming, refactoring, simplifying d75c62694160807382dc6e04c5e186fbb34de711 Corey Donohoe atmos@atmos.org