Skip to content
This repository
Browse code

for Rails 3.0.8, conform to app generated by template

  • Loading branch information...
commit 46e5f6e7472a057f3a13eb1e11607104208bb81b 1 parent 61a3cbd
Daniel Kehoe fortuity authored
1  .gitignore
@@ -22,6 +22,7 @@ tmp/*
22 22 *.rbc
23 23 *.sassc
24 24 .rspec
  25 +.redcar/
25 26 .sass-cache
26 27 /config/config.yml
27 28 /config/database.yml
9 Gemfile
... ... @@ -1,11 +1,10 @@
1 1 source 'http://rubygems.org'
2   -gem 'rails', '3.0.7'
  2 +gem 'rails', '3.0.8.rc2'
3 3 gem 'sqlite3'
4   -gem "rake", "0.8.7"
5   -gem "rspec-rails", "2.5.0", :group => [:development, :test]
  4 +gem "rspec-rails", "2.6.1", :group => [:development, :test]
6 5 gem "factory_girl_rails", "1.1.beta1", :group => :test
7   -gem "cucumber-rails", "0.4.1", :group => :test
8   -gem "capybara", "0.4.1.2", :group => :test
  6 +gem "cucumber-rails", "0.5.1", :group => :test
  7 +gem "capybara", "1.0.0.beta1", :group => :test
9 8 gem "database_cleaner", "0.6.7", :group => :test
10 9 gem "launchy", "0.4.0", :group => :test
11 10 gem "devise", "1.3.4"
94 Gemfile.lock
@@ -2,12 +2,12 @@ GEM
2 2 remote: http://rubygems.org/
3 3 specs:
4 4 abstract (1.0.0)
5   - actionmailer (3.0.7)
6   - actionpack (= 3.0.7)
7   - mail (~> 2.2.15)
8   - actionpack (3.0.7)
9   - activemodel (= 3.0.7)
10   - activesupport (= 3.0.7)
  5 + actionmailer (3.0.8.rc2)
  6 + actionpack (= 3.0.8.rc2)
  7 + mail (~> 2.2.19)
  8 + actionpack (3.0.8.rc2)
  9 + activemodel (= 3.0.8.rc2)
  10 + activesupport (= 3.0.8.rc2)
11 11 builder (~> 2.1.2)
12 12 erubis (~> 2.6.6)
13 13 i18n (~> 0.5.0)
@@ -15,32 +15,29 @@ GEM
15 15 rack-mount (~> 0.6.14)
16 16 rack-test (~> 0.5.7)
17 17 tzinfo (~> 0.3.23)
18   - activemodel (3.0.7)
19   - activesupport (= 3.0.7)
  18 + activemodel (3.0.8.rc2)
  19 + activesupport (= 3.0.8.rc2)
20 20 builder (~> 2.1.2)
21 21 i18n (~> 0.5.0)
22   - activerecord (3.0.7)
23   - activemodel (= 3.0.7)
24   - activesupport (= 3.0.7)
25   - arel (~> 2.0.2)
  22 + activerecord (3.0.8.rc2)
  23 + activemodel (= 3.0.8.rc2)
  24 + activesupport (= 3.0.8.rc2)
  25 + arel (~> 2.0.10)
26 26 tzinfo (~> 0.3.23)
27   - activeresource (3.0.7)
28   - activemodel (= 3.0.7)
29   - activesupport (= 3.0.7)
30   - activesupport (3.0.7)
  27 + activeresource (3.0.8.rc2)
  28 + activemodel (= 3.0.8.rc2)
  29 + activesupport (= 3.0.8.rc2)
  30 + activesupport (3.0.8.rc2)
31 31 arel (2.0.10)
32 32 bcrypt-ruby (2.1.4)
33 33 builder (2.1.2)
34   - capybara (0.4.1.2)
35   - celerity (>= 0.7.9)
36   - culerity (>= 0.2.4)
  34 + capybara (1.0.0.beta1)
37 35 mime-types (>= 1.16)
38 36 nokogiri (>= 1.3.3)
39 37 rack (>= 1.0.0)
40 38 rack-test (>= 0.5.4)
41 39 selenium-webdriver (>= 0.0.27)
42   - xpath (~> 0.1.3)
43   - celerity (0.8.9)
  40 + xpath (~> 0.1.4)
44 41 childprocess (0.1.9)
45 42 ffi (~> 1.0.6)
46 43 configuration (1.2.0)
@@ -50,11 +47,11 @@ GEM
50 47 gherkin (>= 2.3.8)
51 48 json (>= 1.4.6)
52 49 term-ansicolor (>= 1.0.5)
53   - cucumber-rails (0.4.1)
54   - cucumber (>= 0.10.1)
  50 + cucumber-rails (0.5.1)
  51 + capybara (>= 1.0.0.beta1)
  52 + cucumber (>= 0.10.3)
55 53 nokogiri (>= 1.4.4)
56 54 rack-test (>= 0.5.7)
57   - culerity (0.2.15)
58 55 database_cleaner (0.6.7)
59 56 devise (1.3.4)
60 57 bcrypt-ruby (~> 2.1.2)
@@ -90,33 +87,33 @@ GEM
90 87 rack (>= 1.0.0)
91 88 rack-test (0.5.7)
92 89 rack (>= 1.0)
93   - rails (3.0.7)
94   - actionmailer (= 3.0.7)
95   - actionpack (= 3.0.7)
96   - activerecord (= 3.0.7)
97   - activeresource (= 3.0.7)
98   - activesupport (= 3.0.7)
  90 + rails (3.0.8.rc2)
  91 + actionmailer (= 3.0.8.rc2)
  92 + actionpack (= 3.0.8.rc2)
  93 + activerecord (= 3.0.8.rc2)
  94 + activeresource (= 3.0.8.rc2)
  95 + activesupport (= 3.0.8.rc2)
99 96 bundler (~> 1.0)
100   - railties (= 3.0.7)
101   - railties (3.0.7)
102   - actionpack (= 3.0.7)
103   - activesupport (= 3.0.7)
  97 + railties (= 3.0.8.rc2)
  98 + railties (3.0.8.rc2)
  99 + actionpack (= 3.0.8.rc2)
  100 + activesupport (= 3.0.8.rc2)
104 101 rake (>= 0.8.7)
105 102 thor (~> 0.14.4)
106   - rake (0.8.7)
107   - rspec (2.5.0)
108   - rspec-core (~> 2.5.0)
109   - rspec-expectations (~> 2.5.0)
110   - rspec-mocks (~> 2.5.0)
111   - rspec-core (2.5.2)
112   - rspec-expectations (2.5.0)
  103 + rake (0.9.0)
  104 + rspec (2.6.0)
  105 + rspec-core (~> 2.6.0)
  106 + rspec-expectations (~> 2.6.0)
  107 + rspec-mocks (~> 2.6.0)
  108 + rspec-core (2.6.3)
  109 + rspec-expectations (2.6.0)
113 110 diff-lcs (~> 1.1.2)
114   - rspec-mocks (2.5.0)
115   - rspec-rails (2.5.0)
  111 + rspec-mocks (2.6.0)
  112 + rspec-rails (2.6.1)
116 113 actionpack (~> 3.0)
117 114 activesupport (~> 3.0)
118 115 railties (~> 3.0)
119   - rspec (~> 2.5.0)
  116 + rspec (~> 2.6.0)
120 117 rubyzip (0.9.4)
121 118 selenium-webdriver (0.2.0)
122 119 childprocess (>= 0.1.7)
@@ -138,13 +135,12 @@ PLATFORMS
138 135 ruby
139 136
140 137 DEPENDENCIES
141   - capybara (= 0.4.1.2)
142   - cucumber-rails (= 0.4.1)
  138 + capybara (= 1.0.0.beta1)
  139 + cucumber-rails (= 0.5.1)
143 140 database_cleaner (= 0.6.7)
144 141 devise (= 1.3.4)
145 142 factory_girl_rails (= 1.1.beta1)
146 143 launchy (= 0.4.0)
147   - rails (= 3.0.7)
148   - rake (= 0.8.7)
149   - rspec-rails (= 2.5.0)
  144 + rails (= 3.0.8.rc2)
  145 + rspec-rails (= 2.6.1)
150 146 sqlite3
4 features/step_definitions/web_steps.rb
@@ -32,12 +32,12 @@ def with_scope(locator)
32 32 World(WithinHelpers)
33 33
34 34 # Single-line step scoper
35   -When /^(.*) within ([^:]+)$/ do |step, parent|
  35 +When /^(.*) within (.*[^:])$/ do |step, parent|
36 36 with_scope(parent) { When step }
37 37 end
38 38
39 39 # Multi-line step scoper
40   -When /^(.*) within ([^:]+):$/ do |step, parent, table_or_string|
  40 +When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
41 41 with_scope(parent) { When "#{step}:", table_or_string }
42 42 end
43 43
11 features/support/env.rb
@@ -37,3 +37,14 @@
37 37 raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
38 38 end
39 39
  40 +# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
  41 +# See the DatabaseCleaner documentation for details. Example:
  42 +#
  43 +# Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
  44 +# DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
  45 +# end
  46 +#
  47 +# Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
  48 +# DatabaseCleaner.strategy = :transaction
  49 +# end
  50 +#
6 features/support/selectors.rb
@@ -8,13 +8,13 @@ module HtmlSelectorsHelpers
8 8 def selector_for(locator)
9 9 case locator
10 10
11   - when /the page/
  11 + when "the page"
12 12 "html > body"
13 13
14 14 # Add more mappings here.
15 15 # Here is an example that pulls values out of the Regexp:
16 16 #
17   - # when /the (notice|error|info) flash/
  17 + # when /^the (notice|error|info) flash$/
18 18 # ".flash.#{$1}"
19 19
20 20 # You can also return an array to use a different selector
@@ -26,7 +26,7 @@ def selector_for(locator)
26 26 # This allows you to provide a quoted selector as the scope
27 27 # for "within" steps as was previously the default for the
28 28 # web steps:
29   - when /"(.+)"/
  29 + when /^"(.+)"$/
30 30 $1
31 31
32 32 else
2  public/javascripts/rails.js
@@ -64,7 +64,7 @@
64 64 enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled',
65 65
66 66 // Form required input elements
67   - requiredInputSelector: 'input[name][required],textarea[name][required]',
  67 + requiredInputSelector: 'input[name][required]:not([disabled]),textarea[name][required]:not([disabled])',
68 68
69 69 // Form file input elements
70 70 fileInputSelector: 'input:file',
6 public/stylesheets/application.css
... ... @@ -1,10 +1,11 @@
  1 +
1 2 ul.hmenu {
2   - list-style: none;
  3 + list-style: none;
3 4 margin: 0 0 2em;
4 5 padding: 0;
5 6 }
6 7 ul.hmenu li {
7   - display: inline;
  8 + display: inline;
8 9 }
9 10 #flash_notice, #flash_alert {
10 11 padding: 5px 8px;
@@ -18,3 +19,4 @@ ul.hmenu li {
18 19 background-color: #FCC;
19 20 border: solid 1px #C66;
20 21 }
  22 +

0 comments on commit 46e5f6e

Please sign in to comment.
Something went wrong with that request. Please try again.