saucy 0.14.3 → 0.14.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.14.5
+
+* Upgrade to clearance 0.14.0. (Motivated by getting rid of some redundant flashes)
+* Remove Account and Project creation flashes
+
 0.14.3
 
 * Redirect to upgrade page if beyond limit

data/Gemfile

@@ -6,8 +6,9 @@ gemspec
 gem "cucumber-rails", '~> 1.0.6', :require => false
 gem "capybara", :require => false
 gem "factory_girl_rails", :require => false
-gem "formtastic", :require => false
+gem "formtastic", '~> 1.2.4', :require => false
 gem "database_cleaner", :require => false
 gem "dynamic_form", :require => false
 gem "launchy", :require => false
 gem "jquery-rails", :require => false
+gem "selenium-webdriver", "~> 2.16.0"

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    saucy (0.14.2)
+    saucy (0.14.4)
       airbrake (~> 3.0.4)
       braintree (>= 2.6.2)
-      clearance (~> 0.11.2)
-      formtastic (>= 1.2)
+      clearance (~> 0.14.0)
+      formtastic (~> 1.2.4)
       railties (>= 3.0.3)
       sham_rack (= 1.3.3)
       sinatra (>= 1.1.2)
@@ -13,37 +13,36 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
       mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    airbrake (3.0.4)
+    airbrake (3.0.9)
       activesupport
       builder
     arel (2.2.1)
@@ -55,10 +54,9 @@ GEM
       rspec (>= 2.6.0)
     bcat (0.6.2)
       rack (~> 1.0)
-    bcrypt-ruby (3.0.0)
     bourne (1.0)
       mocha (= 0.9.8)
-    braintree (2.11.0)
+    braintree (2.13.2)
       builder (>= 2.0.0)
     builder (3.0.0)
     capybara (1.1.1)
@@ -68,10 +66,10 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.2.9)
       ffi (~> 1.0.6)
-    clearance (0.11.2)
-      diesel (~> 0.1.4)
+    clearance (0.14.0)
+      diesel (~> 0.1.5)
       rails (>= 3.0)
     cucumber (1.0.6)
       builder (>= 2.1.2)
@@ -95,7 +93,7 @@ GEM
     factory_girl_rails (1.2.0)
       factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
-    ffi (1.0.10)
+    ffi (1.0.11)
     formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
@@ -107,8 +105,7 @@ GEM
     jquery-rails (1.0.14)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.1)
-    json_pure (1.6.1)
+    json (1.6.4)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     mail (2.3.0)
@@ -118,36 +115,39 @@ GEM
     mime-types (1.17.2)
     mocha (0.9.8)
       rake
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
-    polyglot (0.3.2)
-    rack (1.3.5)
-    rack-cache (1.0.3)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
+    rack-protection (1.2.0)
+      rack
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdiscount (1.6.8)
-    rdoc (3.9.4)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -161,22 +161,23 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.8.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
+    rubyzip (0.9.5)
+    selenium-webdriver (2.16.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
       rubyzip
     sham_rack (1.3.3)
       rack
     shoulda-matchers (1.0.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    sprockets (2.0.0)
+    sinatra (1.3.2)
+      rack (>= 1.3.6, ~> 1.3)
+      rack-protection (~> 1.2)
+      tilt (>= 1.3.3, ~> 1.3)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.4)
     term-ansicolor (1.0.7)
     thin (1.2.11)
@@ -189,7 +190,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -206,13 +207,14 @@ DEPENDENCIES
   dynamic_form
   factory_girl
   factory_girl_rails
-  formtastic
+  formtastic (~> 1.2.4)
   jquery-rails
   launchy
   rails (>= 3.0.3)
   rake
   rspec-rails
   saucy!
+  selenium-webdriver (~> 2.16.0)
   shoulda-matchers (~> 1.0.0)
   sqlite3
   thin

data/app/controllers/accounts_controller.rb

@@ -24,7 +24,6 @@ class AccountsController < ApplicationController
     if @signup.save
       Saucy::Notifications.notify_observers("account_created", :request => request,
                                                                :account => @signup.account)
-      flash[:success] = "Account was created."
       sign_in @signup.user
       redirect_to new_account_project_path(@signup.account)
     else

data/app/controllers/admin/trial_extensions_controller.rb

@@ -0,0 +1,13 @@
+class Admin::TrialExtensionsController < Admin::BaseController
+  def create
+    @account = Account.find_by_keyword(params[:account_id])
+    @account.reset_trial_expiration
+    if @account.save
+      redirect_to admin_account_path(@account)
+    else
+      flash[:error] = t("trial_extensions.show.invalid",
+                        :default => "The account's trial cannot be extended.")
+      render "admin/accounts/show"
+    end
+  end
+end

data/app/views/admin/accounts/show.html.erb

@@ -13,6 +13,19 @@
   <%= render :partial => 'admin/accounts/account', :object => @account %>
 </table>
 
+<%if @account.trial? -%>
+  <h3>This is a trial account</h3>
+  <p>
+  <% if @account.expired? -%>
+    It <em>expired</em> on <%= @account.trial_expires_at.to_s(:short_date)%>
+    <%= button_to "Extend the trial to #{Saucy::Configuration.trial_length} days from now", admin_account_trial_extensions_path(@account) %>
+  <% else -%>
+    It's set to expire on <%= @account.trial_expires_at.to_s(:short_date) %>
+    <%= button_to "Extend the trial by #{Saucy::Configuration.trial_length} days", admin_account_trial_extensions_path(@account) %>
+  <% end -%>
+  </p>
+<% end -%>
+
 <h3>Projects</h3>
 <% unless @account.projects.empty? -%>
   <table>

data/config/routes.rb

@@ -20,6 +20,7 @@ Rails.application.routes.draw do
   namespace :admin do
     resources :accounts, :only => [:index, :show] do
       get :search, :on => :collection
+      resource :trial_extensions, :only => [:create]
     end
     resources :users, :only => [:index, :show] do
       get :search, :on => :collection

data/features/run_features.feature

@@ -7,13 +7,14 @@ 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", "~> 0.11.2"
+    gem "clearance", "~> 0.14.0"
     gem "cucumber-rails"
+    gem "selenium-webdriver", "~> 2.16.0"
     gem "capybara"
     gem "factory_girl_rails"
     gem "dynamic_form"
     gem "database_cleaner"
-    gem "formtastic"
+    gem "formtastic", "~> 1.2.4"
     gem "rspec-rails"
     gem "bourne"
     gem "shoulda-matchers"

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

@@ -10,7 +10,8 @@ Feature: Manage Billing
       | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            | 1 Robo Lane    | Suite 333        | Beverly Hills | CA     | 90210       | United States of America |
 
   Scenario: Update the billing information on an account with a paid plan
-    Given I have signed in with "joe@example.com"
+    Given I have signed up as "joe@example.com"
+    And I sign 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"
@@ -55,8 +56,9 @@ Feature: Manage Billing
     And the "Country" field should contain "Uganda"
 
   Scenario: Be forced to update the billing information on an account with a paid plan that is past due
-    Given the "Test" account is past due
-    And I have signed in with "joe@example.com"
+    Given I have signed up as "joe@example.com"
+    And the "Test" account is past due
+    And I sign 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
@@ -78,11 +80,12 @@ Feature: Manage Billing
     Then I should be on the billing page for the "Test" account
 
   Scenario: View past credit card charges
-    Given the following transaction exist for the "Test" account:
+    Given I have signed up as "joe@example.com"
+    And the following transaction exist for the "Test" account:
       | 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"
+    And I sign 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"
@@ -90,7 +93,8 @@ Feature: Manage Billing
     And I should see "08/01/10 $5"
 
   Scenario: Navigate back to the main settings page
-    Given I have signed in with "joe@example.com"
+    Given I have signed up as "joe@example.com"
+    And I sign 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"
@@ -99,7 +103,8 @@ Feature: Manage Billing
     Then I should be on the settings page for the "Test" account
 
   Scenario: Billing countries
-    Given I have signed in with "joe@example.com"
+    Given I have signed up as "joe@example.com"
+    And I sign 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,8 @@ Feature: Manage Plan
     And the following paid 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"
+    And I have signed up as "joe@example.com"
+    And I sign 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 +29,8 @@ Feature: Manage Plan
     And the following account exists:
       | name | keyword | plan       |
       | Test | test    | name: Free |
-    And I have signed in with "joe@example.com"
+    And I have signed up as "joe@example.com"
+    And I sign 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"
@@ -62,7 +64,8 @@ Feature: Manage Plan
     And the following account exists:
       | name | keyword | plan       |
       | Test | test    | name: Free |
-    And I have signed in with "joe@example.com"
+    And I have signed up as "joe@example.com"
+    And I sign 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"
@@ -92,7 +95,8 @@ Feature: Manage Plan
     And the following paid 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"
+    And I have signed up as "joe@example.com"
+    And I sign 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"
@@ -119,7 +123,8 @@ 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"
+    And I have signed up as "joe@example.com"
+    And I sign 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"
@@ -146,7 +151,8 @@ 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"
+    And I have signed up as "joe@example.com"
+    And I sign 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/new_account.feature

@@ -9,25 +9,20 @@ Feature: user adds a new account
     And I fill in "Email" with "user@example.com"
     And I fill in "Password" with "test"
     And I press "Sign up"
-    Then I should see "created"
-    But I should not see "Instructions for confirming"
-    And I should be on the new project page for the newest account by "user@example.com"
+    Then I should be on the new project page for the newest account by "user@example.com"
 
   Scenario: sign up for two accounts
     When I go to the sign up page for the "Free" plan
     And I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
     And I press "Sign up"
-    Then I should see "created"
-    And I should be on the new project page for the newest account by "email@person.com"
+    Then I should be on the new project page for the newest account by "email@person.com"
     When I go to the settings page
     Then I should see 1 account
     And I follow "Add new account"
     And I follow "Free"
     Then I should see "Your existing user, email, will be added as the first administrator on this new account."
-    And I press "Sign up"
-    Then I should see "created"
-    But I should not see "Instructions for confirming"
-    And I should be on the new project page for the newest account by "email@person.com"
+    When I press "Sign up"
+    Then I should be on the new project page for the newest account by "email@person.com"
     When I go to the settings page
     Then I should see 2 accounts