clearance 0.11.1 → 0.11.2

data/features/engine/visitor_resets_password.feature

@@ -10,13 +10,13 @@ Feature: Password reset
     Then I should see "Unknown email"
 
   Scenario: User is signed up and requests password reset
-    Given I signed up with "email@example.com/password"
+    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"
 
   Scenario: User tries to reset his password with a blank password
-    Given I signed up with "email@example.com/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"
@@ -27,7 +27,7 @@ Feature: Password reset
     And I should be signed out
 
   Scenario: User is signed up and updates his password
-    Given I signed up with "email@example.com/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"
@@ -36,7 +36,10 @@ Feature: Password reset
     Then I should be signed in
     When I sign out
     Then I should be signed out
-    And I sign in as "email@example.com/newpassword"
+    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"
     Then I should be signed in
 
   Scenario: User who was created before Clearance was installed creates password for first time

data/features/engine/visitor_signs_in.feature

@@ -5,34 +5,32 @@ Feature: Sign in
   I want to sign in
 
   Scenario: Visitor is not signed up
-    Given no user exists with an email of "email@person.com"
+    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@person.com/password"
+    And I sign in as "email@example.com"
     Then I should see "Bad email or password"
     And I should be signed out
 
  Scenario: Visitor enters wrong password
-    Given I am signed up as "email@person.com/password"
+    Given I am signed up as "email@example.com"
     When I go to the sign in page
-    And I sign in as "email@person.com/wrongpassword"
+    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"
     And I should be signed out
 
  Scenario: Visitor signs in successfully
-    Given I am signed up as "email@person.com/password"
+    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@person.com/password"
+    And I sign in as "email@example.com"
     Then I should see "Signed in"
     And I should be signed in
-    When I return next time
-    Then I should be signed in
 
  Scenario: Visitor signs in successfully with uppercase email
-    Given I am signed up as "email@person.com/password"
+    Given I am signed up as "email@example.com"
     When I go to the sign in page
-    And I sign in as "Email@person.com/password"
+    And I sign in as "Email@example.com"
     Then I should see "Signed in"
     And I should be signed in
-    When I return next time
-    Then I should be signed in

data/features/engine/visitor_signs_out.feature

@@ -5,11 +5,9 @@ Feature: Sign out
   I want to sign out
 
   Scenario: User signs out
-    Given I am signed up as "email@person.com/password"
-    When I sign in as "email@person.com/password"
+    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
     Then I should see "Signed out"
     And I should be signed out
-    When I return next time
-    Then I should be signed out

data/features/integration.feature

@@ -1,8 +1,7 @@
-@disable-bundler
 Feature: integrate with application
 
   Background:
-    When I successfully run "rails new testapp"
+    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"
@@ -12,20 +11,20 @@ Feature: integrate with application
     And I add the "capybara" gem
     And I add the "rspec-rails" gem
     And I add the "factory_girl_rails" gem
-    And I add the "dynamic_form" gem
     And I add the "database_cleaner" gem
     And I add the "clearance" gem from this project
-    And I add the "diesel" gem
-    And I run "bundle install --local"
-    And I successfully run "rails generate cucumber:install"
+    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
-    And I successfully run "rails generate clearance:features"
+    And I successfully run `bundle exec rails generate clearance:features`
 
   Scenario: generate a Rails app, run the generators, and run the tests
-    When I successfully run "rails generate clearance:install"
+    When I successfully run `bundle exec rails generate clearance:install`
     Then the output should contain "Next steps"
-    When I successfully run "rake db:migrate --trace"
-    And I successfully run "rake --trace"
+    When I successfully run `bundle exec rake db:migrate --trace`
+    And I successfully run `bundle exec rake --trace`
     Then the output should contain "passed"
     And the output should not contain "failed"
     And the output should not contain "Could not find generator"
@@ -44,10 +43,10 @@ Feature: integrate with application
       end
     end
     """
-    And I successfully run "rake db:migrate --trace"
-    And I successfully run "rails generate clearance:install"
-    And I successfully run "rake db:migrate --trace"
-    And I successfully run "rake --trace"
+    And I successfully run `bundle exec rake db:migrate --trace`
+    And 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 rake --trace`
     Then the output should contain "passed"
     And the output should not contain "failed"
     And the output should not contain "Could not find generator"

data/features/step_definitions/configuration_steps.rb

@@ -16,7 +16,7 @@ When /^I configure a root route$/ do
     contents.sub!(/(\.routes\.draw do)/, "\\1\n#{route}\n")
     File.open(path, "w") { |file| file.write(contents) }
   end
-  create_file("app/controllers/home_controller.rb", <<-CONTROLLER)
+  write_file("app/controllers/home_controller.rb", <<-CONTROLLER)
   class HomeController < ApplicationController
     def show
       render :text => "", :layout => "application"
@@ -35,3 +35,8 @@ When /^I disable Capybara Javascript emulation$/ do
   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')
+  end
+end

data/features/step_definitions/engine/clearance_steps.rb

@@ -22,10 +22,8 @@ Given /^no user exists with an email of "(.*)"$/ do |email|
   assert_nil User.find_by_email(email)
 end
 
-Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)\/(.*)"$/ do |email, password|
-  Factory(:user,
-          :email    => email,
-          :password => password)
+Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)"$/ do |email|
+  Factory(:user, :email => email)
 end
 
 Given /^a user "([^"]*)" exists without a salt, remember token, or password$/ do |email|
@@ -46,21 +44,14 @@ Then /^I should be signed out$/ do
   Then %{I should see "Sign in"}
 end
 
-When /^session is cleared$/ do
-  # TODO: This doesn't work with Capybara
-  # TODO: I tried Capybara.reset_sessions! but that didn't work
-  #request.reset_session
-  #controller.instance_variable_set(:@_current_user, nil)
-end
-
-Given /^(?:I am|I have|I) signed in (?:with|as) "(.*)\/(.*)"$/ do |email, password|
-  Given %{I am signed up as "#{email}/#{password}"}
-  And %{I sign in as "#{email}/#{password}"}
+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}"}
 end
 
 Given /^I sign in$/ do
   email = Factory.next(:email)
-  Given %{I have signed in with "#{email}/password"}
+  Given %{I have signed in with "#{email}"}
 end
 
 # Emails
@@ -90,10 +81,10 @@ end
 
 # Actions
 
-When /^I sign in (?:with|as) "(.*)\/(.*)"$/ do |email, password|
+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 fill in "Password" with "password"}
   And %{I press "Sign in"}
 end
 

data/features/step_definitions/web_steps.rb

@@ -1,21 +1,46 @@
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
+# TL;DR: YOU SHOULD DELETE THIS FILE
+#
+# This file was generated by Cucumber-Rails and is only here to get you a head start
+# These step definitions are thin wrappers around the Capybara/Webrat API that lets you
+# visit pages, interact with widgets and make assertions about page content.
+#
+# If you use these step definitions as basis for your features you will quickly end up
+# with features that are:
+#
+# * Hard to maintain
+# * Verbose to read
+#
+# A much better approach is to write your own higher level step definitions, following
+# the advice in the following blog posts:
+#
+# * http://benmabey.com/2008/05/19/imperative-vs-declarative-scenarios-in-user-stories.html
+# * http://dannorth.net/2011/01/31/whose-domain-is-it-anyway/
+# * http://elabs.se/blog/15-you-re-cuking-it-wrong
+#
 
 
 require 'uri'
 require 'cgi'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
 
 module WithinHelpers
   def with_scope(locator)
-    locator ? within(locator) { yield } : yield
+    locator ? within(*selector_for(locator)) { yield } : yield
   end
 end
 World(WithinHelpers)
 
+# Single-line step scoper
+When /^(.*) within ([^:]+)$/ do |step, parent|
+  with_scope(parent) { When step }
+end
+
+# Multi-line step scoper
+When /^(.*) within ([^:]+):$/ do |step, parent, table_or_string|
+  with_scope(parent) { When "#{step}:", table_or_string }
+end
+
 Given /^(?:|I )am on (.+)$/ do |page_name|
   visit path_to(page_name)
 end
@@ -24,28 +49,20 @@ When /^(?:|I )go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector|
-  with_scope(selector) do
-    click_button(button)
-  end
+When /^(?:|I )press "([^"]*)"$/ do |button|
+  click_button(button)
 end
 
-When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector|
-  with_scope(selector) do
-    click_link(link)
-  end
+When /^(?:|I )follow "([^"]*)"$/ do |link|
+  click_link(link)
 end
 
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector|
-  with_scope(selector) do
-    fill_in(field, :with => value)
-  end
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
+  fill_in(field, :with => value)
 end
 
-When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
-  with_scope(selector) do
-    fill_in(field, :with => value)
-  end
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
+  fill_in(field, :with => value)
 end
 
 # Use this to fill in an entire form with data from a table. Example:
@@ -59,95 +76,70 @@ end
 # TODO: Add support for checkbox, select og option
 # based on naming conventions.
 #
-When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
-  with_scope(selector) do
-    fields.rows_hash.each do |name, value|
-      When %{I fill in "#{name}" with "#{value}"}
-    end
-  end
-end
-
-When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
-  with_scope(selector) do
-    select(value, :from => field)
+When /^(?:|I )fill in the following:$/ do |fields|
+  fields.rows_hash.each do |name, value|
+    When %{I fill in "#{name}" with "#{value}"}
   end
 end
 
-When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
-  with_scope(selector) do
-    check(field)
-  end
+When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
+  select(value, :from => field)
 end
 
-When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
-  with_scope(selector) do
-    uncheck(field)
-  end
+When /^(?:|I )check "([^"]*)"$/ do |field|
+  check(field)
 end
 
-When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
-  with_scope(selector) do
-    choose(field)
-  end
+When /^(?:|I )uncheck "([^"]*)"$/ do |field|
+  uncheck(field)
 end
 
-When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector|
-  with_scope(selector) do
-    attach_file(field, path)
-  end
+When /^(?:|I )choose "([^"]*)"$/ do |field|
+  choose(field)
 end
 
-Then /^(?:|I )should see JSON:$/ do |expected_json|
-  require 'json'
-  expected = JSON.pretty_generate(JSON.parse(expected_json))
-  actual   = JSON.pretty_generate(JSON.parse(response.body))
-  expected.should == actual
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
+  attach_file(field, File.expand_path(path))
 end
 
-Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_content(text)
-    else
-      assert page.has_content?(text)
-    end
+Then /^(?:|I )should see "([^"]*)"$/ do |text|
+  if page.respond_to? :should
+    page.should have_content(text)
+  else
+    assert page.has_content?(text)
   end
 end
 
-Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_xpath('//*', :text => regexp)
-    else
-      assert page.has_xpath?('//*', :text => regexp)
-    end
+
+  if page.respond_to? :should
+    page.should have_xpath('//*', :text => regexp)
+  else
+    assert page.has_xpath?('//*', :text => regexp)
   end
 end
 
-Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_no_content(text)
-    else
-      assert page.has_no_content?(text)
-    end
+Then /^(?:|I )should not see "([^"]*)"$/ do |text|
+  if page.respond_to? :should
+    page.should have_no_content(text)
+  else
+    assert page.has_no_content?(text)
   end
 end
 
-Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_no_xpath('//*', :text => regexp)
-    else
-      assert page.has_no_xpath?('//*', :text => regexp)
-    end
+
+  if page.respond_to? :should
+    page.should have_no_xpath('//*', :text => regexp)
+  else
+    assert page.has_no_xpath?('//*', :text => regexp)
   end
 end
 
-Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value|
-  with_scope(selector) do
+Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
+  with_scope(parent) do
     field = find_field(field)
     field_value = (field.tag_name == 'textarea') ? field.text : field.value
     if field_value.respond_to? :should
@@ -158,8 +150,8 @@ Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |
   end
 end
 
-Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value|
-  with_scope(selector) do
+Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
+  with_scope(parent) do
     field = find_field(field)
     field_value = (field.tag_name == 'textarea') ? field.text : field.value
     if field_value.respond_to? :should_not
@@ -170,8 +162,8 @@ Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/
   end
 end
 
-Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector|
-  with_scope(selector) do
+Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
+  with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
       field_checked.should be_true
@@ -181,8 +173,8 @@ Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |labe
   end
 end
 
-Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector|
-  with_scope(selector) do
+Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
+  with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
       field_checked.should be_false