for Rails 3.0.8, conform to app generated by template

Author: fortuity

.gitignore

@@ -22,6 +22,7 @@ tmp/*
 *.rbc
 *.sassc
 .rspec
+.redcar/
 .sass-cache
 /config/config.yml
 /config/database.yml

Gemfile

@@ -1,11 +1,10 @@
 source 'http://rubygems.org'
-gem 'rails', '3.0.7'
+gem 'rails', '3.0.8.rc2'
 gem 'sqlite3'
-gem "rake", "0.8.7"
-gem "rspec-rails", "2.5.0", :group => [:development, :test]
+gem "rspec-rails", "2.6.1", :group => [:development, :test]
 gem "factory_girl_rails", "1.1.beta1", :group => :test
-gem "cucumber-rails", "0.4.1", :group => :test
-gem "capybara", "0.4.1.2", :group => :test
+gem "cucumber-rails", "0.5.1", :group => :test
+gem "capybara", "1.0.0.beta1", :group => :test
 gem "database_cleaner", "0.6.7", :group => :test
 gem "launchy", "0.4.0", :group => :test
 gem "devise", "1.3.4"

Gemfile.lock

@@ -2,45 +2,42 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionmailer (3.0.8.rc2)
+      actionpack (= 3.0.8.rc2)
+      mail (~> 2.2.19)
+    actionpack (3.0.8.rc2)
+      activemodel (= 3.0.8.rc2)
+      activesupport (= 3.0.8.rc2)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.8.rc2)
+      activesupport (= 3.0.8.rc2)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
+    activerecord (3.0.8.rc2)
+      activemodel (= 3.0.8.rc2)
+      activesupport (= 3.0.8.rc2)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
+    activeresource (3.0.8.rc2)
+      activemodel (= 3.0.8.rc2)
+      activesupport (= 3.0.8.rc2)
+    activesupport (3.0.8.rc2)
     arel (2.0.10)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.0.0.beta1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.9)
+      xpath (~> 0.1.4)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
     configuration (1.2.0)
@@ -50,11 +47,11 @@ GEM
       gherkin (>= 2.3.8)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cucumber-rails (0.4.1)
-      cucumber (>= 0.10.1)
+    cucumber-rails (0.5.1)
+      capybara (>= 1.0.0.beta1)
+      cucumber (>= 0.10.3)
       nokogiri (>= 1.4.4)
       rack-test (>= 0.5.7)
-    culerity (0.2.15)
     database_cleaner (0.6.7)
     devise (1.3.4)
       bcrypt-ruby (~> 2.1.2)
@@ -90,33 +87,33 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.0.8.rc2)
+      actionmailer (= 3.0.8.rc2)
+      actionpack (= 3.0.8.rc2)
+      activerecord (= 3.0.8.rc2)
+      activeresource (= 3.0.8.rc2)
+      activesupport (= 3.0.8.rc2)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.0.8.rc2)
+    railties (3.0.8.rc2)
+      actionpack (= 3.0.8.rc2)
+      activesupport (= 3.0.8.rc2)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
+    rake (0.9.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
     selenium-webdriver (0.2.0)
       childprocess (>= 0.1.7)
@@ -138,13 +135,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (= 0.4.1.2)
-  cucumber-rails (= 0.4.1)
+  capybara (= 1.0.0.beta1)
+  cucumber-rails (= 0.5.1)
   database_cleaner (= 0.6.7)
   devise (= 1.3.4)
   factory_girl_rails (= 1.1.beta1)
   launchy (= 0.4.0)
-  rails (= 3.0.7)
-  rake (= 0.8.7)
-  rspec-rails (= 2.5.0)
+  rails (= 3.0.8.rc2)
+  rspec-rails (= 2.6.1)
   sqlite3

features/step_definitions/web_steps.rb

@@ -32,12 +32,12 @@ def with_scope(locator)
 World(WithinHelpers)
 
 # Single-line step scoper
-When /^(.*) within ([^:]+)$/ do |step, parent|
+When /^(.*) within (.*[^:])$/ do |step, parent|
   with_scope(parent) { When step }
 end
 
 # Multi-line step scoper
-When /^(.*) within ([^:]+):$/ do |step, parent, table_or_string|
+When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
   with_scope(parent) { When "#{step}:", table_or_string }
 end
 

features/support/env.rb

@@ -37,3 +37,14 @@
   raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
 end
 
+# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
+# See the DatabaseCleaner documentation for details. Example:
+#
+#   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
+#     DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
+#   end
+#
+#   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
+#     DatabaseCleaner.strategy = :transaction
+#   end
+#

features/support/selectors.rb

@@ -8,13 +8,13 @@ module HtmlSelectorsHelpers
   def selector_for(locator)
     case locator
 
-    when /the page/
+    when "the page"
       "html > body"
 
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
     #
-    #  when /the (notice|error|info) flash/
+    #  when /^the (notice|error|info) flash$/
     #    ".flash.#{$1}"
 
     # You can also return an array to use a different selector
@@ -26,7 +26,7 @@ def selector_for(locator)
     # This allows you to provide a quoted selector as the scope
     # for "within" steps as was previously the default for the
     # web steps:
-    when /"(.+)"/
+    when /^"(.+)"$/
       $1
 
     else

public/javascripts/rails.js

@@ -64,7 +64,7 @@
     enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled',
 
     // Form required input elements
-    requiredInputSelector: 'input[name][required],textarea[name][required]',
+    requiredInputSelector: 'input[name][required]:not([disabled]),textarea[name][required]:not([disabled])',
 
     // Form file input elements
     fileInputSelector: 'input:file',

public/stylesheets/application.css

@@ -1,10 +1,11 @@
+
 ul.hmenu {
-  list-style: none;	
+  list-style: none;
   margin: 0 0 2em;
   padding: 0;
 }
 ul.hmenu li {
-  display: inline;  
+  display: inline;
 }
 #flash_notice, #flash_alert {
   padding: 5px 8px;
@@ -18,3 +19,4 @@ ul.hmenu li {
   background-color: #FCC;
   border: solid 1px #C66;
 }
+