saucy 0.9.1 → 0.10.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+0.10.0
+
+Bump to a newer version of Clearance.
+
+Update features:
+* Make a trial_plans.feature step definition more specific so as not to conflict
+  with a saucy-kiss gem feature.
+* Update step definitions to work with newer clearance.
+
+You will want to regenerate the saucy features, or look at the commit diffs and
+introduce the above two changes yourself.
+
 0.9.1
 
 Added canceled observer event.

data/features/run_features.feature

@@ -7,7 +7,7 @@ Feature: generate a saucy application and run rake
     And I copy the locked Gemfile from this project
     And I append to "Gemfile" with:
     """
-    gem "clearance", :git => "git://github.com/thoughtbot/clearance.git"
+    gem "clearance", "~> 0.11.2"
     gem "cucumber-rails"
     gem "capybara"
     gem "factory_girl_rails"
@@ -22,7 +22,7 @@ Feature: generate a saucy application and run rake
     gem "jquery-rails"
     """
     When I add the "saucy" gem from this project as a dependency
-    And I successfully run "bundle install --local"
+    And I successfully run "bundle install"
     And I successfully run "rails generate jquery:install --force"
     And I bootstrap the application for clearance
     And I bootstrap the application for saucy
@@ -31,8 +31,8 @@ Feature: generate a saucy application and run rake
     When I successfully run "rails generate saucy:install"
     And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
-    And I successfully run "rake db:migrate"
-    And I run "rake"
+    And I successfully run "bundle exec rake db:migrate"
+    And I run "bundle exec rake"
     Then it should pass with:
     """
     passed
@@ -45,9 +45,9 @@ Feature: generate a saucy application and run rake
     And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
     And I successfully run "rails generate saucy:views"
-    And I successfully run "rake db:migrate"
+    And I successfully run "bundle exec rake db:migrate"
     And I give a more detailed new account message
-    And I run "rake"
+    And I run "bundle exec rake"
     Then it should pass with:
     """
     passed
@@ -59,9 +59,9 @@ Feature: generate a saucy application and run rake
     When I successfully run "rails generate saucy:install"
     And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
-    And I successfully run "rake db:migrate"
+    And I successfully run "bundle exec rake db:migrate"
     And I add a custom layout to the accounts index
-    And I run "rake"
+    And I run "bundle exec rake"
     Then it should pass with:
     """
     passed
@@ -73,9 +73,9 @@ Feature: generate a saucy application and run rake
     When I successfully run "rails generate saucy:install"
     And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
-    And I successfully run "rake db:migrate"
+    And I successfully run "bundle exec rake db:migrate"
     And I copy the specs for this project
-    And I run "rake spec"
+    And I run "bundle exec rake spec"
     Then it should pass with:
     """
     0 failures

data/features/step_definitions/rails_steps.rb

@@ -47,7 +47,7 @@ When /^I add a custom layout to the accounts index$/ do
   create_file('features/custom_accounts_index_layout.feature', <<-SCENARIO)
   Feature: The accounts index should have a custom layout
     Scenario: Custom layout
-      Given I am signed up as "email@person.com/password"
+      Given I am signed up as "email@person.com"
       And the following projects exist:
         | name       | account   |
         | ClothesPin | name: One |
@@ -56,7 +56,7 @@ When /^I add a custom layout to the accounts index$/ do
       And "email@person.com" is a member of the "ClothesPin" project
       And "email@person.com" is a member of the "Talkr" project
       When I go to the sign in page
-      And I sign in as "email@person.com/password"
+      And I sign in as "email@person.com"
       And I go to the dashboard page
       Then I should see "Custom Layout Content"
   SCENARIO

data/lib/generators/saucy/features/templates/features/manage_billing.feature

@@ -8,7 +8,7 @@ Feature: Manage Billing
     And the following account exists:
       | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the billing page for the "Test" account
     Then I should see "card ending in 5555"
@@ -38,7 +38,7 @@ Feature: Manage Billing
       | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
     And the "Test" account is past due
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
     Then I should be on the billing page for the "Test" account
@@ -72,7 +72,7 @@ Feature: Manage Billing
       | status  | amount | created_at        |
       | Settled | 20.00  | July 1, 2010      |
       | Settled | 5.00   | August 1, 2010    |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the billing page for the "Test" account
     Then I should see "Your Invoices"
@@ -84,7 +84,7 @@ Feature: Manage Billing
     And the following account exists:
       | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the billing page for the "Test" account
     And I follow "Change"

data/lib/generators/saucy/features/templates/features/manage_plan.feature

@@ -9,7 +9,7 @@ Feature: Manage Plan
     And the following account exists:
       | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
     Then I should see "Your Plan"
@@ -28,7 +28,7 @@ Feature: Manage Plan
     And the following account exists:
       | name | keyword | plan       |
       | Test | test    | name: Free |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
     Then I should not see "Billing" within ".subnav"
@@ -56,7 +56,7 @@ Feature: Manage Plan
     And the following account exists:
       | name | keyword | plan       |
       | Test | test    | name: Free |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
     Then I should not see "Billing" within ".subnav"
@@ -80,7 +80,7 @@ Feature: Manage Plan
     And the following account exists:
       | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
     Then I should see "Your Plan"
@@ -107,7 +107,7 @@ Feature: Manage Plan
       | name: Free  | projects | 1     | number     |
       | name: Basic | ssl      | 1     | boolean    |
       | name: Free  | ssl      | 0     | boolean    |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
     Then I should see "Your Plan"
@@ -134,7 +134,7 @@ Feature: Manage Plan
       | name: Basic | users    | 1     | number     |
       | name: Basic | projects | 5     | number     |
       | name: Basic | ssl      | 1     | boolean    |
-    And I have signed in with "joe@example.com/test"
+    And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
     Then I should see "1/1" within ".users.meter"

data/lib/generators/saucy/features/templates/features/manage_users.feature

@@ -21,8 +21,8 @@ Feature: Managing users
     When I sign out
     And I follow the link sent to "invitee@example.com"
     And I fill in the following new user:
-      | Name             | Billy  |
-      | Password         | secret |
+      | Name             | Billy    |
+      | Password         | password |
     And I press "Accept Invitation"
     Then I should be signed in
     And "invitee@example.com" should be a member of the "See me" project
@@ -34,7 +34,7 @@ Feature: Managing users
   Scenario: Invite existing user who is not signed in
     Given the following user exists:
       | email               | password |
-      | invitee@example.com | secret   |
+      | invitee@example.com | password |
     When I follow "Invite user"
     And I fill in "Email" with "invitee@example.com"
     And I press "Invite User"
@@ -42,7 +42,7 @@ Feature: Managing users
     When I sign out
     And I follow the link sent to "invitee@example.com"
     And I fill in the following existing user:
-      | Password | secret |
+      | Password | password |
     And I press "Accept Invitation"
     Then I should be signed in
     And "invitee@example.com" should be a member of the "Test" account
@@ -50,13 +50,13 @@ Feature: Managing users
   Scenario: Invite existing user who is signed in
     Given the following user exists:
       | email               | password |
-      | invitee@example.com | secret   |
+      | invitee@example.com | password |
     When I follow "Invite user"
     And I fill in "Email" with "invitee@example.com"
     And I press "Invite User"
     Then I should see "invited"
     When I sign out
-    When I sign in as "invitee@example.com/secret"
+    When I sign in as "invitee@example.com"
     And I follow the link sent to "invitee@example.com"
     Then I should be signed in
     And "invitee@example.com" should be a member of the "Test" account
@@ -72,7 +72,7 @@ Feature: Managing users
   Scenario: Invite admin users
     Given the following user exists:
       | email               | password |
-      | invitee@example.com | secret   |
+      | invitee@example.com | password |
     When I follow "Invite user"
     And I fill in "Email" with "invitee@example.com"
     And I check "Grant administrator privileges"
@@ -80,7 +80,7 @@ Feature: Managing users
     And I sign out
     And I follow the link sent to "invitee@example.com"
     And I fill in the following existing user:
-      | Password | secret |
+      | Password | password |
     And I press "Accept Invitation"
     Then I should be signed in
     And "invitee@example.com" should be an admin member of the "Test" account

data/lib/generators/saucy/features/templates/features/new_account.feature

@@ -4,7 +4,7 @@ Feature: user adds a new account
     Given a plan exists with a name of "Free"
 
   Scenario: existing user adds an account
-    Given I am signed up as "user@example.com/test"
+    Given I am signed up as "user@example.com"
     When I go to the sign up page for the "Free" plan
     And I fill in "Email" with "user@example.com"
     And I fill in "Password" with "test"

data/lib/generators/saucy/features/templates/features/trial_plans.feature

@@ -14,7 +14,7 @@ Feature: Trial plans
     When I go to the list of plans page
     And I follow "Temp"
     Then I should see "Free"
-    And I should see "Trial"
+    And I should see that the plan is a trial plan
     And I should see "Your trial will expire after 30 days"
     But I should not see "users"
     When I fill in "Email" with "email@person.com"
@@ -41,7 +41,7 @@ Feature: Trial plans
     When I go to the list of plans page
     And I follow "Eternal"
     Then I should see "users"
-    But I should not see "Trial"
+    And I should see that the plan is not a trial plan
     And I should not see "expire"
 
   Scenario: Use a non-trial plan forever
@@ -67,7 +67,7 @@ Feature: Trial plans
     And the "Test" account was created 7 days ago
     When the daily Saucy jobs are processed
     Then an email with subject "A check in" should be sent to "admin@example.com"
-    When I sign in as "admin@example.com/password"
+    When I sign in as "admin@example.com"
     And I follow the link sent to "admin@example.com" with subject "A check in"
     Then I should be on the new project page for the newest account by "admin@example.com"
 

data/lib/generators/saucy/features/templates/step_definitions/plan_steps.rb

@@ -14,3 +14,15 @@ When /^I should see the "([^"]*)" plan before the "([^"]*)" plan$/ do |first_pla
   joint_expression  = /#{first_expression}.*#{second_expression}/m
   page.body.should =~ joint_expression
 end
+
+Then "I should see that the plan is a trial plan" do
+  within(".plan.chosen") do
+    page.should have_content("Trial")
+  end
+end
+
+Then "I should see that the plan is not a trial plan" do
+  within(".plan.chosen") do
+    page.should have_no_content("Trial")
+  end
+end

data/lib/generators/saucy/features/templates/step_definitions/session_steps.rb

@@ -25,12 +25,6 @@ Given /^I am signed in as an admin of the "([^"]*)" account$/ do |account_name|
   When %{I sign in as "#{user.email}"}
 end
 
-When /^I sign in as "([^"\/]*)"$/ do |email|
-  user = User.find_by_email!(email)
-  user.update_attributes!(:password => 'test')
-  When %{I sign in as "#{email}/test"}
-end
-
 Given /^I am signed in$/ do
   user = Factory(:user)
   When %{I sign in as "#{user.email}"}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
-  - 1
-  version: 0.9.1
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -31,12 +31,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 55
         segments: 
         - 0
         - 11
-        - 0
-        version: 0.11.0
+        - 2
+        version: 0.11.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency