clearance 0.16.3 → 1.0.0.rc1

data/db/migrate/20110111224543_create_clearance_users.rb

@@ -0,0 +1,18 @@
+class CreateClearanceUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users  do |t|
+      t.timestamps :null => false
+      t.string :email, :null => false
+      t.string :encrypted_password, :limit => 128, :null => false
+      t.string :confirmation_token, :limit => 128
+      t.string :remember_token, :limit => 128, :null => false
+    end
+
+    add_index :users, :email
+    add_index :users, :remember_token
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/db/schema.rb

@@ -14,13 +14,12 @@
 ActiveRecord::Schema.define(:version => 20110111224543) do
 
   create_table "users", :force => true do |t|
-    t.string   "email"
-    t.string   "encrypted_password", :limit => 128
-    t.string   "salt",               :limit => 128
-    t.string   "confirmation_token", :limit => 128
-    t.string   "remember_token",     :limit => 128
     t.datetime "created_at",                        :null => false
     t.datetime "updated_at",                        :null => false
+    t.string   "email",                             :null => false
+    t.string   "encrypted_password", :limit => 128, :null => false
+    t.string   "confirmation_token", :limit => 128
+    t.string   "remember_token",     :limit => 128, :null => false
   end
 
   add_index "users", ["email"], :name => "index_users_on_email"

data/features/engine/visitor_resets_password.feature

@@ -32,10 +32,3 @@ Feature: Password reset
     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 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

@@ -24,3 +24,10 @@ Feature: Sign in
     Given I am signed up as "email@example.com"
     When I sign in as "Email@example.com"
     Then I should be signed in
+
+ Scenario: Visitor enters wrong password and goes to sign up
+    Given I am signed up as "email@example.com"
+    When I sign in as "email@example.com" and "badpassword"
+    Then I am told email or password is bad
+    When I follow the sign up link in the flash
+    Then I should be on the sign up page

data/features/engine/visitor_signs_up.feature

@@ -6,11 +6,11 @@ Feature: Sign up
 
   Scenario: Visitor signs up with invalid email
     When I sign up with "invalidemail" and "password"
-    Then I am told to enter a valid email address
+    Then I should be signed out
 
   Scenario: Visitor signs up with blank password
     When I sign up with "email@example.com" and ""
-    Then I am told to enter a password
+    Then I should be signed out
 
   Scenario: Visitor signs up with valid data
     When I sign up with "email@example.com" and "password"

data/features/integration.feature

@@ -15,7 +15,6 @@ Feature: integrate with application
     And I add the "clearance" gem from this project
     And I run `bundle install --local`
     And I successfully run `bundle exec rails generate cucumber:install`
-    And I disable Capybara Javascript emulation
     And I successfully run `bundle exec rails generate clearance:features`
 
   Scenario: generate a Rails app, run the generators, and run the tests

data/features/integration_with_test_unit.feature

@@ -0,0 +1,43 @@
+Feature: integrate with test unit
+
+  Background:
+    When I successfully run `bundle exec rails new testapp`
+    And I cd to "testapp"
+    And I remove the file "public/index.html"
+    And I remove the file "app/views/layouts/application.html.erb"
+    And I configure ActionMailer to use "localhost" as a host
+    And I configure a root route
+    And I add the "factory_girl_rails" gem
+    And I run `bundle install --local`
+
+  Scenario: generate a Rails app, run the generators, and run the tests
+    When I successfully run `bundle exec rails generate clearance:install`
+    And I successfully run `bundle exec rake db:migrate --trace`
+    And I successfully run `bundle exec rails generate controller posts index`
+    And I add the "cucumber-rails" gem
+    And I write to "test/test_helper.rb" with:
+    """
+    ENV['RAILS_ENV'] = 'test'
+    require File.expand_path('../../config/environment', __FILE__)
+    require 'rails/test_help'
+
+    class ActiveSupport::TestCase
+      fixtures :all
+    end
+
+    require 'clearance/testing'
+    """
+    And I write to "test/functionals/posts_controller_test.rb" with:
+    """
+    require 'test_helper'
+
+    class PostsControllerTest < ActionController::TestCase
+      test 'should get index' do
+        sign_in
+        get :index
+        assert_response :success
+      end
+    end
+    """
+    And I successfully run `bundle exec rake --trace`
+    Then the output should contain "1 tests, 1 assertions, 0 failures"

data/features/step_definitions/configuration_steps.rb

@@ -1,6 +1,7 @@
 When /^I configure ActionMailer to use "([^"]+)" as a host$/ do |host|
   mailer_config = "config.action_mailer.default_url_options = { :host => '#{host}' }"
-  path = "config/application.rb"
+  path = 'config/application.rb'
+
   in_current_dir do
     contents = IO.read(path)
     contents.sub!(/(class .* < Rails::Application)/, "\\1\n#{mailer_config}")
@@ -10,31 +11,23 @@ end
 
 When /^I configure a root route$/ do
   route = "root :to => 'home#show'"
-  path = "config/routes.rb"
+  path = 'config/routes.rb'
+
   in_current_dir do
     contents = IO.read(path)
     contents.sub!(/(\.routes\.draw do)/, "\\1\n#{route}\n")
-    File.open(path, "w") { |file| file.write(contents) }
+    File.open(path, 'w') { |file| file.write(contents) }
   end
-  write_file("app/controllers/home_controller.rb", <<-CONTROLLER)
+
+  write_file('app/controllers/home_controller.rb', <<-CONTROLLER)
   class HomeController < ApplicationController
     def show
-      render :text => "", :layout => "application"
+      render :text => '', :layout => 'application'
     end
   end
   CONTROLLER
 end
 
-When /^I disable Capybara Javascript emulation$/ do
-  in_current_dir do
-    path = "features/support/env.rb"
-    contents = IO.read(path)
-    contents.sub!(%{require 'cucumber/rails/capybara_javascript_emulation'},
-                  "# Disabled")
-    File.open(path, "w") { |file| file.write(contents) }
-  end
-end
-
 When /^I copy the locked Gemfile from this project$/ do
   in_current_dir do
     FileUtils.cp(File.join(PROJECT_ROOT, 'Gemfile.lock'), 'Gemfile.lock')

data/features/step_definitions/engine/clearance_steps.rb

@@ -3,13 +3,7 @@
 require 'factory_girl_rails'
 
 Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)"$/ do |email|
-  FactoryGirl.create(:user, :email => email)
-end
-
-Given /^a user "([^"]*)" exists without a salt, remember token, or password$/ do |email|
-  user = FactoryGirl.create(:user, :email => email)
-  sql  = "update users set salt = NULL, encrypted_password = NULL, remember_token = NULL where id = #{user.id}"
-  ActiveRecord::Base.connection.update(sql)
+  FactoryGirl.create :user, :email => email
 end
 
 # Sign up
@@ -17,10 +11,9 @@ end
 When /^I sign up (?:with|as) "(.*)" and "(.*)"$/ do |email, password|
   visit sign_up_path
   page.should have_css("input[type='email']")
-
-  fill_in "Email", :with => email
-  fill_in "Password", :with => password
-  click_button "Sign up"
+  fill_in 'Email', :with => email
+  fill_in 'Password', :with => password
+  click_button 'Sign up'
 end
 
 # Sign in
@@ -28,8 +21,8 @@ end
 Given /^I sign in$/ do
   email = FactoryGirl.generate(:email)
   steps %{
-    I have signed up with "#{email}"
-    I sign in with "#{email}"
+    Given I have signed up with "#{email}"
+    And I sign in with "#{email}"
   }
 end
 
@@ -40,17 +33,16 @@ end
 When /^I sign in (?:with|as) "([^"]*)" and "([^"]*)"$/ do |email, password|
   visit sign_in_path
   page.should have_css("input[type='email']")
-
-  fill_in "Email", :with => email
-  fill_in "Password", :with => password
-  click_button "Sign in"
+  fill_in 'Email', :with => email
+  fill_in 'Password', :with => password
+  click_button 'Sign in'
 end
 
 # Sign out
 
-When "I sign out" do
-  visit "/"
-  click_link "Sign out"
+When 'I sign out' do
+  visit '/'
+  click_link 'Sign out'
 end
 
 # Reset password
@@ -58,22 +50,22 @@ end
 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"
+  fill_in 'Email address', :with => email
+  click_button 'Reset password'
 end
 
 Then /^instructions for changing my password are emailed to "(.*)"$/ do |email|
-  page.should have_content("instructions for changing your password")
-
+  page.should have_content('instructions for changing your password')
   user = User.find_by_email!(email)
   assert !user.confirmation_token.blank?
   assert !ActionMailer::Base.deliveries.empty?
+
   result = ActionMailer::Base.deliveries.any? do |email|
-    email.to      == [user.email] &&
+    email.to == [user.email] &&
     email.subject =~ /password/i &&
-    email.body    =~ /#{user.confirmation_token}/
+    email.body =~ /#{user.confirmation_token}/
   end
+
   assert result
 end
 
@@ -89,22 +81,30 @@ When /^I change the password of "(.*)" without token$/ do |email|
 end
 
 When /^I update my password with "(.*)"$/ do |password|
-  fill_in "Choose password", :with => password
-  click_button "Save this password"
+  fill_in 'Choose password', :with => password
+  click_button 'Save this password'
+end
+
+# Navigation
+
+Then /^I should be on the sign up page$/ do
+  page.current_path.should == sign_up_path
 end
 
 # Flashes
 
 Then /^I am told email or password is bad$/ do
-  page.should have_content("Bad email or password")
+  page.should have_content('Bad email or password. Are you trying to register a new account? Sign up.')
 end
 
-Then /^I am told email is unknown$/ do
-  page.should have_content("Unknown email")
+When /^I follow the sign up link in the flash$/ do
+  within '#flash' do
+    click_link 'Sign up'
+  end
 end
 
-Then /^I am told to enter a valid email address$/ do
-  page.should have_content("Must be a valid email address")
+Then /^I am told email is unknown$/ do
+  page.should have_content('Unknown email')
 end
 
 Then /^I am told to enter a password$/ do
@@ -114,11 +114,11 @@ end
 # Verification
 
 Then /^I should be signed in$/ do
-  visit "/"
-  page.should have_content "Sign out"
+  visit '/'
+  page.should have_content 'Sign out'
 end
 
 Then /^I should be signed out$/ do
-  visit "/"
-  page.should have_content "Sign in"
+  visit '/'
+  page.should have_content 'Sign in'
 end

data/features/support/clearance.rb

@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
   include Clearance::Authentication
 
   def show
-    render :text => "", :layout => 'application'
+    render :text => '', :layout => 'application'
   end
 end
 

data/features/support/env.rb

@@ -4,10 +4,10 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-ENV["RAILS_ENV"] ||= "test"
+ENV['RAILS_ENV'] ||= 'test'
 
-PROJECT_ROOT = File.expand_path("../../..", __FILE__)
-$LOAD_PATH << File.join(PROJECT_ROOT, "lib")
+PROJECT_ROOT = File.expand_path('../../..', __FILE__)
+$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 
 require 'rails/all'
 
@@ -29,27 +29,10 @@ require 'cucumber/rails/capybara'
 Capybara.default_selector = :css
 Capybara.save_and_open_page_path = 'tmp'
 
-# By default, any exception happening in your Rails application will bubble up
-# to Cucumber so that your scenario will fail. This is a different from how 
-# your application behaves in the production environment, where an error page will 
-# be rendered instead.
-#
-# Sometimes we want to override this default behaviour and allow Rails to rescue
-# exceptions and display an error page (just like when the app is running in production).
-# Typical scenarios where you want to do this is when you test your error pages.
-# There are two ways to allow Rails to rescue exceptions:
-#
-# 1) Tag your scenario (or feature) with @allow-rescue
-#
-# 2) Set the value below to true. Beware that doing this globally is not
-# recommended as it will mask a lot of errors for you!
-#
 ActionController::Base.allow_rescue = false
 
-# Remove/comment out the lines below if your app doesn't have a database.
-# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
 begin
   DatabaseCleaner.strategy = :transaction
 rescue NameError
-  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+  raise 'You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it.'
 end

data/gemfiles/{3.0.12.gemfile → 3.0.15.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.12"
+gem "rails", "3.0.15"
 
 gemspec :path=>"../"

data/gemfiles/{3.0.12.gemfile.lock → 3.0.15.gemfile.lock}

@@ -1,20 +1,21 @@
 PATH
-  remote: /home/mike/clearance
+  remote: /home/mike/thoughtbot/clearance
   specs:
-    clearance (0.16.2)
-      diesel (~> 0.1.5)
+    clearance (1.0.0.rc1)
+      bcrypt-ruby
+      diesel (= 0.1.5)
       rails (>= 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.12)
-      actionpack (= 3.0.12)
+    actionmailer (3.0.15)
+      actionpack (= 3.0.15)
       mail (~> 2.2.19)
-    actionpack (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
+    actionpack (3.0.15)
+      activemodel (= 3.0.15)
+      activesupport (= 3.0.15)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -22,20 +23,20 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.12)
-      activesupport (= 3.0.12)
+    activemodel (3.0.15)
+      activesupport (= 3.0.15)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
+    activerecord (3.0.15)
+      activemodel (= 3.0.15)
+      activesupport (= 3.0.15)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-    activesupport (3.0.12)
-    addressable (2.2.7)
+    activeresource (3.0.15)
+      activemodel (= 3.0.15)
+      activesupport (= 3.0.15)
+    activesupport (3.0.15)
+    addressable (2.3.1)
     appraisal (0.4.1)
       bundler
       rake
@@ -45,6 +46,7 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
+    bcrypt-ruby (3.0.1)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (2.1.2)
@@ -55,99 +57,97 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
-    cucumber (1.1.9)
+    childprocess (0.3.4)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     cucumber-rails (1.1.1)
       capybara (>= 1.1.1)
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
-    database_cleaner (0.7.2)
+    database_cleaner (0.8.0)
     diesel (0.1.5)
       railties
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (3.1.1)
+    factory_girl (3.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.1.0)
-      factory_girl (~> 3.1.0)
+    factory_girl_rails (3.5.0)
+      factory_girl (~> 3.5.0)
       railties (>= 3.0.0)
-    ffi (1.0.11)
-    gherkin (2.9.3)
+    ffi (1.1.0)
+    gherkin (2.11.1)
       json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.6.6)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
+    json (1.7.3)
+    libwebsocket (0.1.4)
+      addressable
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.18)
+    mime-types (1.19)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.2.0)
-    nokogiri (1.5.2)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.12)
-      actionmailer (= 3.0.12)
-      actionpack (= 3.0.12)
-      activerecord (= 3.0.12)
-      activeresource (= 3.0.12)
-      activesupport (= 3.0.12)
+    rails (3.0.15)
+      actionmailer (= 3.0.15)
+      actionpack (= 3.0.15)
+      activerecord (= 3.0.15)
+      activeresource (= 3.0.15)
+      activesupport (= 3.0.15)
       bundler (~> 1.0)
-      railties (= 3.0.12)
-    railties (3.0.12)
-      actionpack (= 3.0.12)
-      activesupport (= 3.0.12)
+      railties (= 3.0.15)
+    railties (3.0.15)
+      actionpack (= 3.0.15)
+      activesupport (= 3.0.15)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rspec-rails (2.9.0)
+    rspec-mocks (2.11.1)
+    rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.9.0)
-    rubyzip (0.9.6.1)
-    selenium-webdriver (2.20.0)
+      rspec (~> 2.11.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    shoulda-matchers (1.1.0)
+    shoulda-matchers (1.2.0)
       activesupport (>= 3.0.0)
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     timecop (0.3.5)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -155,18 +155,17 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 0.4.1)
-  aruba (~> 0.4.11)
-  bourne (~> 1.1.2)
-  bundler (~> 1.1.0)
-  capybara (~> 1.1.2)
+  appraisal (= 0.4.1)
+  aruba (= 0.4.11)
+  bourne (= 1.1.2)
+  bundler (= 1.1.3)
+  capybara (= 1.1.2)
   clearance!
-  cucumber-rails (~> 1.1.1)
-  database_cleaner
-  factory_girl_rails (~> 3.1.0)
-  launchy
-  rails (= 3.0.12)
-  rspec-rails (~> 2.9.0)
-  shoulda-matchers (~> 1.1.0)
-  sqlite3
-  timecop
+  cucumber-rails (= 1.1.1)
+  database_cleaner (= 0.8.0)
+  factory_girl_rails (= 3.5.0)
+  rails (= 3.0.15)
+  rspec-rails (= 2.11.0)
+  shoulda-matchers (= 1.2.0)
+  sqlite3 (= 1.3.6)
+  timecop (= 0.3.5)