clearance 0.12.0 → 0.13.0

data/app/views/sessions/new.html.erb

@@ -1,18 +1,6 @@
 <h2>Sign in</h2>
 
-<%= form_for :session, :url => session_path do |form| %>
-  <div class="text_field">
-    <%= form.label :email %>
-    <%= form.text_field :email, :type => "email" %>
-  </div>
-  <div class="text_field">
-    <%= form.label :password %>
-    <%= form.password_field :password %>
-  </div>
-  <div class="submit_field">
-    <%= form.submit "Sign in" %>
-  </div>
-<% end %>
+<%= render :partial => '/sessions/form' %>
 
 <ul>
   <li>

data/clearance.gemspec

@@ -23,9 +23,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
 
   s.add_dependency('rails',  '>= 3.0')
-  s.add_dependency('diesel', '~> 0.1.4')
+  s.add_dependency('diesel', '~> 0.1.5')
 
-  s.add_development_dependency('bundler', '~> 1.0.0')
+  s.add_development_dependency('bundler',        '~> 1.0.0')
+  s.add_development_dependency('appraisal',      '~> 0.3.8')
+  s.add_development_dependency('cucumber-rails', '~> 1.0.2')
+  s.add_development_dependency('rspec-rails',    '~> 2.6.0')
+  s.add_development_dependency('sqlite3')
+  s.add_development_dependency('mocha')
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/features/engine/visitor_resets_password.feature

@@ -5,48 +5,36 @@ Feature: Password reset
   I want to reset my password
 
   Scenario: User is not signed up
-    Given no user exists with an email of "email@example.com"
-    When I request password reset link to be sent to "email@example.com"
-    Then I should see "Unknown email"
+    When I reset the password for "unknown.email@example.com"
+    Then I am told email is unknown
 
   Scenario: User is signed up and requests password reset
     Given I signed up with "email@example.com"
-    When I request password reset link to be sent to "email@example.com"
-    Then I should see "instructions for changing your password"
-    And a password reset message should be sent to "email@example.com"
+    When I reset the password for "email@example.com"
+    Then instructions for changing my password are emailed to "email@example.com"
 
   Scenario: User tries to reset his password with a blank password
     Given I signed up with "email@example.com"
-    And I go to the password reset request page
-    Then I should see an email field
-    And I fill in "Email address" with "email@example.com"
-    And I press "Reset password"
-    When I follow the password reset link sent to "email@example.com"
+    When I reset the password for "email@example.com"
+    And I follow the password reset link sent to "email@example.com"
     And I update my password with ""
-    Then I should see "Password can't be blank."
+    Then I am told to enter a password
     And I should be signed out
 
   Scenario: User is signed up and updates his password
     Given I signed up with "email@example.com"
-    And I go to the password reset request page
-    And I fill in "Email address" with "email@example.com"
-    And I press "Reset password"
-    When I follow the password reset link sent to "email@example.com"
+    When I reset the password for "email@example.com"
+    And I follow the password reset link sent to "email@example.com"
     And I update my password with "newpassword"
     Then I should be signed in
     When I sign out
     Then I should be signed out
-    When I go to the sign in page
-    And I fill in "Email" with "email@example.com"
-    And I fill in "Password" with "newpassword"
-    And I press "Sign in"
+    When I sign in with "email@example.com" and "newpassword"
     Then I should be signed in
 
   Scenario: User who was created before Clearance was installed creates password for first time
     Given a user "email@example.com" exists without a salt, remember token, or password
-    When I go to the password reset request page
-    And I fill in "Email address" with "email@example.com"
-    And I press "Reset password"
+    When I reset the password for "email@example.com"
     When I follow the password reset link sent to "email@example.com"
     And I update my password with "newpassword"
     Then I should be signed in

data/features/engine/visitor_signs_in.feature

@@ -5,30 +5,22 @@ Feature: Sign in
   I want to sign in
 
   Scenario: Visitor is not signed up
-    Given no user exists with an email of "email@example.com"
-    When I go to the sign in page
-    And I sign in as "email@example.com"
-    Then I should see "Bad email or password"
+    When I sign in as "unknown.email@example.com"
+    Then I am told email or password is bad
     And I should be signed out
 
  Scenario: Visitor enters wrong password
     Given I am signed up as "email@example.com"
-    When I go to the sign in page
-    And I fill in "Email" with "email@example.com"
-    And I fill in "Password" with "badpassword"
-    And I press "Sign in"
-    Then I should see "Bad email or password"
+    When I sign in as "email@example.com" and "badpassword"
+    Then I am told email or password is bad
     And I should be signed out
 
  Scenario: Visitor signs in successfully
     Given I am signed up as "email@example.com"
-    When I go to the sign in page
-    Then I should see an email field
-    And I sign in as "email@example.com"
+    When I sign in as "email@example.com"
     Then I should be signed in
 
  Scenario: Visitor signs in successfully with uppercase email
     Given I am signed up as "email@example.com"
-    When I go to the sign in page
-    And I sign in as "Email@example.com"
+    When I sign in as "Email@example.com"
     Then I should be signed in

data/features/engine/visitor_signs_out.feature

@@ -8,5 +8,5 @@ Feature: Sign out
     Given I am signed up as "email@example.com"
     When I sign in as "email@example.com"
     Then I should be signed in
-    And I sign out
+    When I sign out
     Then I should be signed out

data/features/engine/visitor_signs_up.feature

@@ -4,24 +4,14 @@ Feature: Sign up
   As a visitor
   I want to sign up
 
-  Background:
-    When I go to the sign up page
-    Then I should see an email field
-
   Scenario: Visitor signs up with invalid email
-    When I fill in "Email" with "invalidemail"
-    And I fill in "Password" with "password"
-    And I press "Sign up"
-    Then I should see "Must be a valid email address"
+    When I sign up with "invalidemail" and "password"
+    Then I am told to enter a valid email address
 
   Scenario: Visitor signs up with blank password
-    When I fill in "Email" with "email@example.com"
-    And I fill in "Password" with ""
-    And I press "Sign up"
-    Then I should see "Password can't be blank"
+    When I sign up with "email@example.com" and ""
+    Then I am told to enter a password
 
   Scenario: Visitor signs up with valid data
-    When I fill in "Email" with "email@example.com"
-    And I fill in "Password" with "password"
-    And I press "Sign up"
-    Then I should be on the home page
+    When I sign up with "email@example.com" and "password"
+    Then I should be signed in

data/features/integration.feature

@@ -13,8 +13,6 @@ Feature: integrate with application
     And I add the "factory_girl_rails" gem
     And I add the "database_cleaner" gem
     And I add the "clearance" gem from this project
-    And I add the "diesel" gem from git "git://github.com/thoughtbot/diesel.git"
-    And I reset Bundler environment variable
     And I run `bundle install --local`
     And I successfully run `bundle exec rails generate cucumber:install`
     And I disable Capybara Javascript emulation

data/features/step_definitions/engine/clearance_steps.rb

@@ -1,63 +1,70 @@
-# General
+# Existing users
 
-Then /^I should see error messages$/ do
-  Then %{I should see "errors prohibited"}
+Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)"$/ do |email|
+  Factory(:user, :email => email)
 end
 
-Then /^I should see an error message$/ do
-  Then %{I should see "error prohibited"}
+Given /^a user "([^"]*)" exists without a salt, remember token, or password$/ do |email|
+  user = Factory(:user, :email => email)
+  sql  = "update users set salt = NULL, encrypted_password = NULL, remember_token = NULL where id = #{user.id}"
+  ActiveRecord::Base.connection.update(sql)
 end
 
-Then /^I should see an email field$/ do
-  if page.respond_to?(:should)
-    page.should have_css("input[type='email']")
-  else
-    assert page.has_css("input[type='email']")
-  end
-end
+# Sign up
 
-# Database
+When /^I sign up (?:with|as) "(.*)" and "(.*)"$/ do |email, password|
+  visit sign_up_path
+  page.should have_css("input[type='email']")
 
-Given /^no user exists with an email of "(.*)"$/ do |email|
-  assert_nil User.find_by_email(email)
+  fill_in "Email", :with => email
+  fill_in "Password", :with => password
+  click_button "Sign up"
 end
 
-Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)"$/ do |email|
-  Factory(:user, :email => email)
+# Sign in
+
+Given /^I sign in$/ do
+  email = Factory.next(:email)
+  steps %{
+    I have signed up with "#{email}"
+    I sign in with "#{email}"
+  }
 end
 
-Given /^a user "([^"]*)" exists without a salt, remember token, or password$/ do |email|
-  user = Factory(:user, :email => email)
-  sql  = "update users set salt = NULL, encrypted_password = NULL, remember_token = NULL where id = #{user.id}"
-  ActiveRecord::Base.connection.update(sql)
+When /^I sign in (?:with|as) "([^"]*)"$/ do |email|
+  When %{I sign in with "#{email}" and "password"}
 end
 
-# Session
+When /^I sign in (?:with|as) "([^"]*)" and "([^"]*)"$/ do |email, password|
+  visit sign_in_path
+  page.should have_css("input[type='email']")
 
-Then /^I should be signed in$/ do
-  Given %{I am on the homepage}
-  Then %{I should see "Sign out"}
+  fill_in "Email", :with => email
+  fill_in "Password", :with => password
+  click_button "Sign in"
 end
 
-Then /^I should be signed out$/ do
-  Given %{I am on the homepage}
-  Then %{I should see "Sign in"}
-end
+# Sign out
 
-Given /^(?:I am|I have|I) signed in (?:with|as) "(.*)"$/ do |email|
-  Given %{I am signed up as "#{email}"}
-  And %{I sign in as "#{email}"}
+When "I sign out" do
+  visit "/"
+  click_link "Sign out"
 end
 
-Given /^I sign in$/ do
-  email = Factory.next(:email)
-  Given %{I have signed in with "#{email}"}
+# Reset password
+
+When /^I reset the password for "(.*)"$/ do |email|
+  visit new_password_path
+  page.should have_css("input[type='email']")
+
+  fill_in "Email address", :with => email
+  click_button "Reset password"
 end
 
-# Emails
+Then /^instructions for changing my password are emailed to "(.*)"$/ do |email|
+  page.should have_content("instructions for changing your password")
 
-Then /^a password reset message should be sent to "(.*)"$/ do |email|
-  user = User.find_by_email(email)
+  user = User.find_by_email!(email)
   assert !user.confirmation_token.blank?
   assert !ActionMailer::Base.deliveries.empty?
   result = ActionMailer::Base.deliveries.any? do |email|
@@ -69,44 +76,47 @@ Then /^a password reset message should be sent to "(.*)"$/ do |email|
 end
 
 When /^I follow the password reset link sent to "(.*)"$/ do |email|
-  user = User.find_by_email(email)
+  user = User.find_by_email!(email)
   visit edit_user_password_path(:user_id => user,
                                 :token   => user.confirmation_token)
 end
 
-When /^I try to change the password of "(.*)" without token$/ do |email|
-  user = User.find_by_email(email)
+When /^I change the password of "(.*)" without token$/ do |email|
+  user = User.find_by_email!(email)
   visit edit_user_password_path(:user_id => user)
 end
 
-# Actions
+When /^I update my password with "(.*)"$/ do |password|
+  fill_in "Choose password", :with => password
+  click_button "Save this password"
+end
+
+# Flashes
 
-When /^I sign in (?:with|as) "(.*)"$/ do |email|
-  When %{I go to the sign in page}
-  And %{I fill in "Email" with "#{email}"}
-  And %{I fill in "Password" with "password"}
-  And %{I press "Sign in"}
+Then /^I am told email or password is bad$/ do
+  page.should have_content("Bad email or password")
 end
 
-When "I sign out" do
-  steps %{
-    When I go to the homepage
-    And I follow "Sign out"
-  }
+Then /^I am told email is unknown$/ do
+  page.should have_content("Unknown email")
 end
 
-When /^I request password reset link to be sent to "(.*)"$/ do |email|
-  When %{I go to the password reset request page}
-  And %{I fill in "Email address" with "#{email}"}
-  And %{I press "Reset password"}
+Then /^I am told to enter a valid email address$/ do
+  page.should have_content("Must be a valid email address")
 end
 
-When /^I update my password with "(.*)"$/ do |password|
-  And %{I fill in "Choose password" with "#{password}"}
-  And %{I press "Save this password"}
+Then /^I am told to enter a password$/ do
+  page.should have_content("Password can't be blank")
 end
 
-When /^I return next time$/ do
-  When %{session is cleared}
-  And %{I go to the homepage}
+# Verification
+
+Then /^I should be signed in$/ do
+  visit "/"
+  page.should have_content "Sign out"
+end
+
+Then /^I should be signed out$/ do
+  visit "/"
+  page.should have_content "Sign in"
 end

data/features/support/env.rb

@@ -15,8 +15,8 @@ Bundler.require
 
 require 'diesel/testing'
 require 'diesel/testing/integration'
-require 'cucumber/rails3/application'
-require 'cucumber/rails3/action_controller'
+require 'cucumber/rails/application'
+require 'cucumber/rails/action_controller'
 require 'rails/test_help'
 require 'cucumber/rails/world'
 require 'cucumber/rails/hooks'

data/gemfiles/3.0.9.gemfile

@@ -2,17 +2,12 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3"
-gem "rails", "3.0.9"
+gem "capybara", "~> 1.0.0"
+gem "factory_girl_rails"
 gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
-gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
 gem "database_cleaner"
-gem "rspec-rails", "~> 2.6.0"
-gem "aruba", "~> 0.4.2"
-gem "cucumber-rails", "1.0.0"
-gem "mocha"
-gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
-gem "capybara", "1.0.0"
-gem "factory_girl_rails"
 gem "launchy"
+gem "aruba", "~> 0.4.2"
+gem "rails", "3.0.9"
 
+gemspec :path=>"../"

data/gemfiles/3.0.9.gemfile.lock

@@ -1,25 +1,16 @@
-GIT
-  remote: git://github.com/thoughtbot/appraisal.git
-  revision: f8029181543b4bc4bdea03735a3b1e558fd66501
-  specs:
-    appraisal (0.3.5)
-      aruba (~> 0.4.2)
-      bundler
-      rake
-
-GIT
-  remote: git://github.com/thoughtbot/diesel.git
-  revision: 9a7955eadd3e2f445ecf3d2d58edfc2a5e80a20b
-  specs:
-    diesel (0.1.4)
-      railties
-
 GIT
   remote: git://github.com/thoughtbot/shoulda-matchers.git
-  revision: 85d3e5ea000cf162ef672059ea5e5f77f3ca9f03
+  revision: 5190a39bba699d4989c2500c98622b505e2de828
   specs:
     shoulda-matchers (1.0.0.beta3)
 
+PATH
+  remote: /Users/croaky/dev/clearance
+  specs:
+    clearance (0.12.0)
+      diesel (~> 0.1.5)
+      rails (>= 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -50,8 +41,12 @@ GEM
       activemodel (= 3.0.9)
       activesupport (= 3.0.9)
     activesupport (3.0.9)
+    addressable (2.2.6)
+    appraisal (0.3.8)
+      bundler
+      rake
     arel (2.0.10)
-    aruba (0.4.3)
+    aruba (0.4.5)
       bcat (>= 0.6.1)
       childprocess (>= 0.1.9)
       cucumber (>= 0.10.7)
@@ -69,25 +64,25 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    configuration (1.2.0)
     cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cucumber-rails (1.0.0)
+    cucumber-rails (1.0.2)
       capybara (>= 1.0.0)
       cucumber (~> 1.0.0)
-      nokogiri (>= 1.4.4)
-      rack-test (>= 0.5.7)
+      nokogiri (>= 1.4.6)
     database_cleaner (0.6.7)
+    diesel (0.1.5)
+      railties
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (1.3.3)
-    factory_girl_rails (1.0.1)
-      factory_girl (~> 1.3)
+    factory_girl (2.0.5)
+    factory_girl_rails (1.1.0)
+      factory_girl (~> 2.0.0)
       railties (>= 3.0.0)
     ffi (1.0.9)
     gherkin (2.4.1)
@@ -95,9 +90,8 @@ GEM
     i18n (0.5.0)
     json (1.5.3)
     json_pure (1.5.2)
-    launchy (0.4.0)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -105,7 +99,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.12)
-    nokogiri (1.4.5)
+    nokogiri (1.4.6)
     polyglot (0.3.1)
     rack (1.2.3)
     rack-mount (0.6.14)
@@ -161,12 +155,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal!
+  appraisal (~> 0.3.8)
   aruba (~> 0.4.2)
-  capybara (= 1.0.0)
-  cucumber-rails (= 1.0.0)
+  bundler (~> 1.0.0)
+  capybara (~> 1.0.0)
+  clearance!
+  cucumber-rails (~> 1.0.2)
   database_cleaner
-  diesel!
   factory_girl_rails
   launchy
   mocha