Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixing broken tests and update Rails dependency

  • Loading branch information...
commit bb4e627efc6af1d79189073169debf3e3bc5e9d8 1 parent 1d19331
Prem Sichanugrist authored February 10, 2012
29  Appraisals
... ...
@@ -1,19 +1,20 @@
1  
-appraise "3.0.9" do
2  
-  gem "rails", "3.0.9"
  1
+appraise '3.0.9' do
  2
+  gem 'rails', '3.0.9'
3 3
 end
4 4
 
5  
-appraise "3.1.0" do
6  
-  gem "rails", "3.1.0"
7  
-  gem "sass"
8  
-  gem "coffee-script"
9  
-  gem "uglifier"
10  
-  gem "jquery-rails"
  5
+appraise '3.1.3' do
  6
+  gem 'rails', '3.1.3'
  7
+  gem 'sass-rails', '~> 3.1.5'
  8
+  gem 'coffee-rails', '~> 3.1.1'
  9
+  gem 'uglifier', '>= 1.0.3'
  10
+  gem 'jquery-rails'
  11
+  gem 'turn', '~> 0.8.3'
11 12
 end
12 13
 
13  
-appraise "3.2.0" do
14  
-  gem "rails", "3.2.0"
15  
-  gem "sass"
16  
-  gem "coffee-script"
17  
-  gem "uglifier"
18  
-  gem "jquery-rails"
  14
+appraise '3.2.1' do
  15
+  gem 'rails', '3.2.1'
  16
+  gem 'sass-rails',   '~> 3.2.3'
  17
+  gem 'coffee-rails', '~> 3.2.1'
  18
+  gem 'uglifier', '>= 1.0.3'
  19
+  gem 'jquery-rails'
19 20
 end
26  Gemfile.lock
@@ -51,18 +51,21 @@ GEM
51 51
       gherkin (~> 2.7.1)
52 52
       json (>= 1.4.6)
53 53
       term-ansicolor (>= 1.0.6)
54  
-    cucumber-rails (0.5.2)
55  
-      capybara (>= 1.0.0.rc1)
56  
-      cucumber (>= 0.10.5)
57  
-      nokogiri (>= 1.4.4)
58  
-      rack-test (>= 0.5.7)
  54
+    cucumber-rails (1.2.1)
  55
+      capybara (>= 1.1.2)
  56
+      cucumber (>= 1.1.3)
  57
+      nokogiri (>= 1.5.0)
59 58
     daemons (1.1.8)
60 59
     database_cleaner (0.7.1)
61 60
     diff-lcs (1.1.3)
62 61
     erubis (2.7.0)
63 62
     eventmachine (0.12.10)
64 63
     ffi (1.0.11)
65  
-    gherkin (2.7.6)
  64
+    formtastic (1.2.4)
  65
+      actionpack (>= 2.3.7)
  66
+      activesupport (>= 2.3.7)
  67
+      i18n (~> 0.4)
  68
+    gherkin (2.7.7)
66 69
       json (>= 1.4.6)
67 70
     hike (1.2.1)
68 71
     i18n (0.6.0)
@@ -103,8 +106,8 @@ GEM
103 106
       activesupport (~> 3.0)
104 107
       railties (~> 3.0)
105 108
       rspec (~> 2.6.0)
106  
-    rubyzip (0.9.5)
107  
-    selenium-webdriver (2.18.0)
  109
+    rubyzip (0.9.6.1)
  110
+    selenium-webdriver (2.19.0)
108 111
       childprocess (>= 0.2.5)
109 112
       ffi (~> 1.0.9)
110 113
       multi_json (~> 1.0.4)
@@ -114,8 +117,6 @@ GEM
114 117
       rack (~> 1.0)
115 118
       tilt (~> 1.1, != 1.3.0)
116 119
     sqlite3 (1.3.5)
117  
-    sqlite3-ruby (1.3.3)
118  
-      sqlite3 (>= 1.3.3)
119 120
     term-ansicolor (1.0.7)
120 121
     thin (1.3.1)
121 122
       daemons (>= 1.0.9)
@@ -135,10 +136,11 @@ PLATFORMS
135 136
 DEPENDENCIES
136 137
   appraisal (~> 0.4)
137 138
   aruba
138  
-  cucumber-rails (~> 0.5.2)
  139
+  cucumber-rails (~> 1.2.1)
139 140
   database_cleaner
140 141
   diesel!
  142
+  formtastic (~> 1.2.3)
141 143
   rspec-rails (~> 2.6.1)
142  
-  sqlite3-ruby
  144
+  sqlite3
143 145
   thin
144 146
   turn
5  diesel.gemspec
@@ -19,14 +19,15 @@ Gem::Specification.new do |s|
19 19
 
20 20
   s.add_dependency('railties')
21 21
 
22  
-  s.add_development_dependency('cucumber-rails', '~> 0.5.2')
  22
+  s.add_development_dependency('cucumber-rails', '~> 1.2.1 ')
23 23
   s.add_development_dependency('aruba')
24 24
   s.add_development_dependency('appraisal', '~> 0.4')
25 25
   s.add_development_dependency('rspec-rails', '~> 2.6.1')
26 26
   s.add_development_dependency('thin')
27  
-  s.add_development_dependency('sqlite3-ruby')
  27
+  s.add_development_dependency('sqlite3')
28 28
   s.add_development_dependency('database_cleaner')
29 29
   s.add_development_dependency('turn')
  30
+  s.add_development_dependency('formtastic', '~> 1.2.3')
30 31
 
31 32
   s.platform = Gem::Platform::RUBY
32 33
   s.rubygems_version = %q{1.2.0}
8  features/features_generator.feature
@@ -59,6 +59,10 @@ Feature: reusable features generator
59 59
     """
60 60
     When I write to "features/step_definitions/engine/example_steps.rb" with:
61 61
     """
  62
+    When /^I go to the examples page$/ do
  63
+      visit '/examples'
  64
+    end
  65
+
62 66
     Then %{I should receive a warm greeting} do
63 67
       page.should have_content("Hello there")
64 68
     end
@@ -68,11 +72,11 @@ Feature: reusable features generator
68 72
     And I cd to "testapp"
69 73
     And I append to "Gemfile" with:
70 74
     """
71  
-    gem "capybara", "~> 1.0.0"
  75
+    gem "capybara"
72 76
     gem "rspec"
73 77
     group :test do
74 78
       gem "database_cleaner"
75  
-      gem "cucumber-rails", "~> 0.5.2"
  79
+      gem "cucumber-rails", "~> 1.2.1"
76 80
     end
77 81
     """
78 82
     When I add the "testengine" as a diesel engine
1  features/rails_rake_tasks_and_generators.feature
@@ -22,6 +22,7 @@ Feature: use Rails rake tasks when developing a diesel application
22 22
     """
23 23
     ENV["RAILS_ENV"] ||= 'test'
24 24
     require "diesel/testing"
  25
+    require 'test/unit'
25 26
     require 'rspec/rails'
26 27
 
27 28
     describe Post do
1  features/rspec_testing.feature
@@ -14,6 +14,7 @@ Feature: test a diesel engine using rspec
14 14
     """
15 15
     ENV["RAILS_ENV"] ||= 'test'
16 16
     require "diesel/testing"
  17
+    require 'test/unit'
17 18
     require 'rspec/rails'
18 19
 
19 20
     describe ExampleController do
32  gemfiles/3.0.9.gemfile.lock
... ...
@@ -1,5 +1,5 @@
1 1
 PATH
2  
-  remote: /Users/gabe/thoughtbot/diesel
  2
+  remote: /Users/sikachu/Projects/diesel
3 3
   specs:
4 4
     diesel (0.1.5)
5 5
       railties
@@ -63,11 +63,10 @@ GEM
63 63
       gherkin (~> 2.7.1)
64 64
       json (>= 1.4.6)
65 65
       term-ansicolor (>= 1.0.6)
66  
-    cucumber-rails (0.5.2)
67  
-      capybara (>= 1.0.0.rc1)
68  
-      cucumber (>= 0.10.5)
69  
-      nokogiri (>= 1.4.4)
70  
-      rack-test (>= 0.5.7)
  66
+    cucumber-rails (1.2.1)
  67
+      capybara (>= 1.1.2)
  68
+      cucumber (>= 1.1.3)
  69
+      nokogiri (>= 1.5.0)
71 70
     daemons (1.1.8)
72 71
     database_cleaner (0.7.1)
73 72
     diff-lcs (1.1.3)
@@ -75,7 +74,11 @@ GEM
75 74
       abstract (>= 1.0.0)
76 75
     eventmachine (0.12.10)
77 76
     ffi (1.0.11)
78  
-    gherkin (2.7.6)
  77
+    formtastic (1.2.4)
  78
+      actionpack (>= 2.3.7)
  79
+      activesupport (>= 2.3.7)
  80
+      i18n (~> 0.4)
  81
+    gherkin (2.7.7)
79 82
       json (>= 1.4.6)
80 83
     i18n (0.5.0)
81 84
     json (1.6.5)
@@ -85,7 +88,6 @@ GEM
85 88
       mime-types (~> 1.16)
86 89
       treetop (~> 1.4.8)
87 90
     mime-types (1.17.2)
88  
-    minitest (2.11.1)
89 91
     multi_json (1.0.4)
90 92
     nokogiri (1.5.0)
91 93
     polyglot (0.3.3)
@@ -125,15 +127,13 @@ GEM
125 127
       activesupport (~> 3.0)
126 128
       railties (~> 3.0)
127 129
       rspec (~> 2.6.0)
128  
-    rubyzip (0.9.5)
129  
-    selenium-webdriver (2.18.0)
  130
+    rubyzip (0.9.6.1)
  131
+    selenium-webdriver (2.19.0)
130 132
       childprocess (>= 0.2.5)
131 133
       ffi (~> 1.0.9)
132 134
       multi_json (~> 1.0.4)
133 135
       rubyzip
134 136
     sqlite3 (1.3.5)
135  
-    sqlite3-ruby (1.3.3)
136  
-      sqlite3 (>= 1.3.3)
137 137
     term-ansicolor (1.0.7)
138 138
     thin (1.3.1)
139 139
       daemons (>= 1.0.9)
@@ -143,9 +143,8 @@ GEM
143 143
     treetop (1.4.10)
144 144
       polyglot
145 145
       polyglot (>= 0.3.1)
146  
-    turn (0.9.1)
  146
+    turn (0.9.2)
147 147
       ansi
148  
-      minitest
149 148
     tzinfo (0.3.31)
150 149
     xpath (0.1.4)
151 150
       nokogiri (~> 1.3)
@@ -156,11 +155,12 @@ PLATFORMS
156 155
 DEPENDENCIES
157 156
   appraisal (~> 0.4)
158 157
   aruba
159  
-  cucumber-rails (~> 0.5.2)
  158
+  cucumber-rails (~> 1.2.1)
160 159
   database_cleaner
161 160
   diesel!
  161
+  formtastic (~> 1.2.3)
162 162
   rails (= 3.0.9)
163 163
   rspec-rails (~> 2.6.1)
164  
-  sqlite3-ruby
  164
+  sqlite3
165 165
   thin
166 166
   turn
11  gemfiles/3.1.0.gemfile
... ...
@@ -1,11 +0,0 @@
1  
-# This file was generated by Appraisal
2  
-
3  
-source "http://rubygems.org"
4  
-
5  
-gem "rails", "3.1.0"
6  
-gem "sass"
7  
-gem "coffee-script"
8  
-gem "uglifier"
9  
-gem "jquery-rails"
10  
-
11  
-gemspec :path=>"../"
12  gemfiles/3.1.3.gemfile
... ...
@@ -0,0 +1,12 @@
  1
+# This file was generated by Appraisal
  2
+
  3
+source "http://rubygems.org"
  4
+
  5
+gem "rails", "3.1.3"
  6
+gem "sass-rails", "~> 3.1.5"
  7
+gem "coffee-rails", "~> 3.1.1"
  8
+gem "uglifier", ">= 1.0.3"
  9
+gem "jquery-rails"
  10
+gem "turn", "~> 0.8.3"
  11
+
  12
+gemspec :path=>"../"
110  gemfiles/3.1.0.gemfile.lock → gemfiles/3.1.3.gemfile.lock
... ...
@@ -1,5 +1,5 @@
1 1
 PATH
2  
-  remote: /Users/gabe/thoughtbot/diesel
  2
+  remote: /Users/sikachu/Projects/diesel
3 3
   specs:
4 4
     diesel (0.1.5)
5 5
       railties
@@ -7,34 +7,33 @@ PATH
7 7
 GEM
8 8
   remote: http://rubygems.org/
9 9
   specs:
10  
-    actionmailer (3.1.0)
11  
-      actionpack (= 3.1.0)
  10
+    actionmailer (3.1.3)
  11
+      actionpack (= 3.1.3)
12 12
       mail (~> 2.3.0)
13  
-    actionpack (3.1.0)
14  
-      activemodel (= 3.1.0)
15  
-      activesupport (= 3.1.0)
  13
+    actionpack (3.1.3)
  14
+      activemodel (= 3.1.3)
  15
+      activesupport (= 3.1.3)
16 16
       builder (~> 3.0.0)
17 17
       erubis (~> 2.7.0)
18 18
       i18n (~> 0.6)
19  
-      rack (~> 1.3.2)
20  
-      rack-cache (~> 1.0.3)
  19
+      rack (~> 1.3.5)
  20
+      rack-cache (~> 1.1)
21 21
       rack-mount (~> 0.8.2)
22 22
       rack-test (~> 0.6.1)
23  
-      sprockets (~> 2.0.0)
24  
-    activemodel (3.1.0)
25  
-      activesupport (= 3.1.0)
26  
-      bcrypt-ruby (~> 3.0.0)
  23
+      sprockets (~> 2.0.3)
  24
+    activemodel (3.1.3)
  25
+      activesupport (= 3.1.3)
27 26
       builder (~> 3.0.0)
28 27
       i18n (~> 0.6)
29  
-    activerecord (3.1.0)
30  
-      activemodel (= 3.1.0)
31  
-      activesupport (= 3.1.0)
  28
+    activerecord (3.1.3)
  29
+      activemodel (= 3.1.3)
  30
+      activesupport (= 3.1.3)
32 31
       arel (~> 2.2.1)
33 32
       tzinfo (~> 0.3.29)
34  
-    activeresource (3.1.0)
35  
-      activemodel (= 3.1.0)
36  
-      activesupport (= 3.1.0)
37  
-    activesupport (3.1.0)
  33
+    activeresource (3.1.3)
  34
+      activemodel (= 3.1.3)
  35
+      activesupport (= 3.1.3)
  36
+    activesupport (3.1.3)
38 37
       multi_json (~> 1.0)
39 38
     ansi (1.4.2)
40 39
     appraisal (0.4.0)
@@ -49,7 +48,6 @@ GEM
49 48
       rspec (>= 2.6.0)
50 49
     bcat (0.6.2)
51 50
       rack (~> 1.0)
52  
-    bcrypt-ruby (3.0.1)
53 51
     builder (3.0.0)
54 52
     capybara (1.1.2)
55 53
       mime-types (>= 1.16)
@@ -60,6 +58,9 @@ GEM
60 58
       xpath (~> 0.1.4)
61 59
     childprocess (0.3.1)
62 60
       ffi (~> 1.0.6)
  61
+    coffee-rails (3.1.1)
  62
+      coffee-script (>= 2.2.0)
  63
+      railties (~> 3.1.0)
63 64
     coffee-script (2.2.0)
64 65
       coffee-script-source
65 66
       execjs
@@ -70,11 +71,10 @@ GEM
70 71
       gherkin (~> 2.7.1)
71 72
       json (>= 1.4.6)
72 73
       term-ansicolor (>= 1.0.6)
73  
-    cucumber-rails (0.5.2)
74  
-      capybara (>= 1.0.0.rc1)
75  
-      cucumber (>= 0.10.5)
76  
-      nokogiri (>= 1.4.4)
77  
-      rack-test (>= 0.5.7)
  74
+    cucumber-rails (1.2.1)
  75
+      capybara (>= 1.1.2)
  76
+      cucumber (>= 1.1.3)
  77
+      nokogiri (>= 1.5.0)
78 78
     daemons (1.1.8)
79 79
     database_cleaner (0.7.1)
80 80
     diff-lcs (1.1.3)
@@ -83,7 +83,11 @@ GEM
83 83
     execjs (1.3.0)
84 84
       multi_json (~> 1.0)
85 85
     ffi (1.0.11)
86  
-    gherkin (2.7.6)
  86
+    formtastic (1.2.4)
  87
+      actionpack (>= 2.3.7)
  88
+      activesupport (>= 2.3.7)
  89
+      i18n (~> 0.4)
  90
+    gherkin (2.7.7)
87 91
       json (>= 1.4.6)
88 92
     hike (1.2.1)
89 93
     i18n (0.6.0)
@@ -96,12 +100,11 @@ GEM
96 100
       mime-types (~> 1.16)
97 101
       treetop (~> 1.4.8)
98 102
     mime-types (1.17.2)
99  
-    minitest (2.11.1)
100 103
     multi_json (1.0.4)
101 104
     nokogiri (1.5.0)
102 105
     polyglot (0.3.3)
103 106
     rack (1.3.6)
104  
-    rack-cache (1.0.3)
  107
+    rack-cache (1.1)
105 108
       rack (>= 0.4)
106 109
     rack-mount (0.8.3)
107 110
       rack (>= 1.0.0)
@@ -109,17 +112,17 @@ GEM
109 112
       rack
110 113
     rack-test (0.6.1)
111 114
       rack (>= 1.0)
112  
-    rails (3.1.0)
113  
-      actionmailer (= 3.1.0)
114  
-      actionpack (= 3.1.0)
115  
-      activerecord (= 3.1.0)
116  
-      activeresource (= 3.1.0)
117  
-      activesupport (= 3.1.0)
  115
+    rails (3.1.3)
  116
+      actionmailer (= 3.1.3)
  117
+      actionpack (= 3.1.3)
  118
+      activerecord (= 3.1.3)
  119
+      activeresource (= 3.1.3)
  120
+      activesupport (= 3.1.3)
118 121
       bundler (~> 1.0)
119  
-      railties (= 3.1.0)
120  
-    railties (3.1.0)
121  
-      actionpack (= 3.1.0)
122  
-      activesupport (= 3.1.0)
  122
+      railties (= 3.1.3)
  123
+    railties (3.1.3)
  124
+      actionpack (= 3.1.3)
  125
+      activesupport (= 3.1.3)
123 126
       rack-ssl (~> 1.3.2)
124 127
       rake (>= 0.8.7)
125 128
       rdoc (~> 3.4)
@@ -141,9 +144,14 @@ GEM
141 144
       activesupport (~> 3.0)
142 145
       railties (~> 3.0)
143 146
       rspec (~> 2.6.0)
144  
-    rubyzip (0.9.5)
145  
-    sass (3.1.14)
146  
-    selenium-webdriver (2.18.0)
  147
+    rubyzip (0.9.6.1)
  148
+    sass (3.1.15)
  149
+    sass-rails (3.1.5)
  150
+      actionpack (~> 3.1.0)
  151
+      railties (~> 3.1.0)
  152
+      sass (~> 3.1.10)
  153
+      tilt (~> 1.3.2)
  154
+    selenium-webdriver (2.19.0)
147 155
       childprocess (>= 0.2.5)
148 156
       ffi (~> 1.0.9)
149 157
       multi_json (~> 1.0.4)
@@ -153,8 +161,6 @@ GEM
153 161
       rack (~> 1.0)
154 162
       tilt (~> 1.1, != 1.3.0)
155 163
     sqlite3 (1.3.5)
156  
-    sqlite3-ruby (1.3.3)
157  
-      sqlite3 (>= 1.3.3)
158 164
     term-ansicolor (1.0.7)
159 165
     thin (1.3.1)
160 166
       daemons (>= 1.0.9)
@@ -165,9 +171,8 @@ GEM
165 171
     treetop (1.4.10)
166 172
       polyglot
167 173
       polyglot (>= 0.3.1)
168  
-    turn (0.9.1)
  174
+    turn (0.8.3)
169 175
       ansi
170  
-      minitest
171 176
     tzinfo (0.3.31)
172 177
     uglifier (1.2.3)
173 178
       execjs (>= 0.3.0)
@@ -181,15 +186,16 @@ PLATFORMS
181 186
 DEPENDENCIES
182 187
   appraisal (~> 0.4)
183 188
   aruba
184  
-  coffee-script
185  
-  cucumber-rails (~> 0.5.2)
  189
+  coffee-rails (~> 3.1.1)
  190
+  cucumber-rails (~> 1.2.1)
186 191
   database_cleaner
187 192
   diesel!
  193
+  formtastic (~> 1.2.3)
188 194
   jquery-rails
189  
-  rails (= 3.1.0)
  195
+  rails (= 3.1.3)
190 196
   rspec-rails (~> 2.6.1)
191  
-  sass
192  
-  sqlite3-ruby
  197
+  sass-rails (~> 3.1.5)
  198
+  sqlite3
193 199
   thin
194  
-  turn
195  
-  uglifier
  200
+  turn (~> 0.8.3)
  201
+  uglifier (>= 1.0.3)
11  gemfiles/3.2.0.gemfile
... ...
@@ -1,11 +0,0 @@
1  
-# This file was generated by Appraisal
2  
-
3  
-source "http://rubygems.org"
4  
-
5  
-gem "rails", "3.2.0"
6  
-gem "sass"
7  
-gem "coffee-script"
8  
-gem "uglifier"
9  
-gem "jquery-rails"
10  
-
11  
-gemspec :path=>"../"
11  gemfiles/3.2.1.gemfile
... ...
@@ -0,0 +1,11 @@
  1
+# This file was generated by Appraisal
  2
+
  3
+source "http://rubygems.org"
  4
+
  5
+gem "rails", "3.2.1"
  6
+gem "sass-rails", "~> 3.2.3"
  7
+gem "coffee-rails", "~> 3.2.1"
  8
+gem "uglifier", ">= 1.0.3"
  9
+gem "jquery-rails"
  10
+
  11
+gemspec :path=>"../"
99  gemfiles/3.2.0.gemfile.lock → gemfiles/3.2.1.gemfile.lock
... ...
@@ -1,5 +1,5 @@
1 1
 PATH
2  
-  remote: /Users/gabe/thoughtbot/diesel
  2
+  remote: /Users/sikachu/Projects/diesel
3 3
   specs:
4 4
     diesel (0.1.5)
5 5
       railties
@@ -7,31 +7,31 @@ PATH
7 7
 GEM
8 8
   remote: http://rubygems.org/
9 9
   specs:
10  
-    actionmailer (3.2.0)
11  
-      actionpack (= 3.2.0)
  10
+    actionmailer (3.2.1)
  11
+      actionpack (= 3.2.1)
12 12
       mail (~> 2.4.0)
13  
-    actionpack (3.2.0)
14  
-      activemodel (= 3.2.0)
15  
-      activesupport (= 3.2.0)
  13
+    actionpack (3.2.1)
  14
+      activemodel (= 3.2.1)
  15
+      activesupport (= 3.2.1)
16 16
       builder (~> 3.0.0)
17 17
       erubis (~> 2.7.0)
18  
-      journey (~> 1.0.0)
  18
+      journey (~> 1.0.1)
19 19
       rack (~> 1.4.0)
20 20
       rack-cache (~> 1.1)
21 21
       rack-test (~> 0.6.1)
22 22
       sprockets (~> 2.1.2)
23  
-    activemodel (3.2.0)
24  
-      activesupport (= 3.2.0)
  23
+    activemodel (3.2.1)
  24
+      activesupport (= 3.2.1)
25 25
       builder (~> 3.0.0)
26  
-    activerecord (3.2.0)
27  
-      activemodel (= 3.2.0)
28  
-      activesupport (= 3.2.0)
  26
+    activerecord (3.2.1)
  27
+      activemodel (= 3.2.1)
  28
+      activesupport (= 3.2.1)
29 29
       arel (~> 3.0.0)
30 30
       tzinfo (~> 0.3.29)
31  
-    activeresource (3.2.0)
32  
-      activemodel (= 3.2.0)
33  
-      activesupport (= 3.2.0)
34  
-    activesupport (3.2.0)
  31
+    activeresource (3.2.1)
  32
+      activemodel (= 3.2.1)
  33
+      activesupport (= 3.2.1)
  34
+    activesupport (3.2.1)
35 35
       i18n (~> 0.6)
36 36
       multi_json (~> 1.0)
37 37
     ansi (1.4.2)
@@ -57,6 +57,9 @@ GEM
57 57
       xpath (~> 0.1.4)
58 58
     childprocess (0.3.1)
59 59
       ffi (~> 1.0.6)
  60
+    coffee-rails (3.2.2)
  61
+      coffee-script (>= 2.2.0)
  62
+      railties (~> 3.2.0)
60 63
     coffee-script (2.2.0)
61 64
       coffee-script-source
62 65
       execjs
@@ -67,11 +70,10 @@ GEM
67 70
       gherkin (~> 2.7.1)
68 71
       json (>= 1.4.6)
69 72
       term-ansicolor (>= 1.0.6)
70  
-    cucumber-rails (0.5.2)
71  
-      capybara (>= 1.0.0.rc1)
72  
-      cucumber (>= 0.10.5)
73  
-      nokogiri (>= 1.4.4)
74  
-      rack-test (>= 0.5.7)
  73
+    cucumber-rails (1.2.1)
  74
+      capybara (>= 1.1.2)
  75
+      cucumber (>= 1.1.3)
  76
+      nokogiri (>= 1.5.0)
75 77
     daemons (1.1.8)
76 78
     database_cleaner (0.7.1)
77 79
     diff-lcs (1.1.3)
@@ -80,7 +82,11 @@ GEM
80 82
     execjs (1.3.0)
81 83
       multi_json (~> 1.0)
82 84
     ffi (1.0.11)
83  
-    gherkin (2.7.6)
  85
+    formtastic (1.2.4)
  86
+      actionpack (>= 2.3.7)
  87
+      activesupport (>= 2.3.7)
  88
+      i18n (~> 0.4)
  89
+    gherkin (2.7.7)
84 90
       json (>= 1.4.6)
85 91
     hike (1.2.1)
86 92
     i18n (0.6.0)
@@ -94,7 +100,6 @@ GEM
94 100
       mime-types (~> 1.16)
95 101
       treetop (~> 1.4.8)
96 102
     mime-types (1.17.2)
97  
-    minitest (2.11.1)
98 103
     multi_json (1.0.4)
99 104
     nokogiri (1.5.0)
100 105
     polyglot (0.3.3)
@@ -105,17 +110,17 @@ GEM
105 110
       rack
106 111
     rack-test (0.6.1)
107 112
       rack (>= 1.0)
108  
-    rails (3.2.0)
109  
-      actionmailer (= 3.2.0)
110  
-      actionpack (= 3.2.0)
111  
-      activerecord (= 3.2.0)
112  
-      activeresource (= 3.2.0)
113  
-      activesupport (= 3.2.0)
  113
+    rails (3.2.1)
  114
+      actionmailer (= 3.2.1)
  115
+      actionpack (= 3.2.1)
  116
+      activerecord (= 3.2.1)
  117
+      activeresource (= 3.2.1)
  118
+      activesupport (= 3.2.1)
114 119
       bundler (~> 1.0)
115  
-      railties (= 3.2.0)
116  
-    railties (3.2.0)
117  
-      actionpack (= 3.2.0)
118  
-      activesupport (= 3.2.0)
  120
+      railties (= 3.2.1)
  121
+    railties (3.2.1)
  122
+      actionpack (= 3.2.1)
  123
+      activesupport (= 3.2.1)
119 124
       rack-ssl (~> 1.3.2)
120 125
       rake (>= 0.8.7)
121 126
       rdoc (~> 3.4)
@@ -137,9 +142,13 @@ GEM
137 142
       activesupport (~> 3.0)
138 143
       railties (~> 3.0)
139 144
       rspec (~> 2.6.0)
140  
-    rubyzip (0.9.5)
141  
-    sass (3.1.14)
142  
-    selenium-webdriver (2.18.0)
  145
+    rubyzip (0.9.6.1)
  146
+    sass (3.1.15)
  147
+    sass-rails (3.2.4)
  148
+      railties (~> 3.2.0)
  149
+      sass (>= 3.1.10)
  150
+      tilt (~> 1.3)
  151
+    selenium-webdriver (2.19.0)
143 152
       childprocess (>= 0.2.5)
144 153
       ffi (~> 1.0.9)
145 154
       multi_json (~> 1.0.4)
@@ -149,8 +158,6 @@ GEM
149 158
       rack (~> 1.0)
150 159
       tilt (~> 1.1, != 1.3.0)
151 160
     sqlite3 (1.3.5)
152  
-    sqlite3-ruby (1.3.3)
153  
-      sqlite3 (>= 1.3.3)
154 161
     term-ansicolor (1.0.7)
155 162
     thin (1.3.1)
156 163
       daemons (>= 1.0.9)
@@ -161,9 +168,8 @@ GEM
161 168
     treetop (1.4.10)
162 169
       polyglot
163 170
       polyglot (>= 0.3.1)
164  
-    turn (0.9.1)
  171
+    turn (0.9.2)
165 172
       ansi
166  
-      minitest
167 173
     tzinfo (0.3.31)
168 174
     uglifier (1.2.3)
169 175
       execjs (>= 0.3.0)
@@ -177,15 +183,16 @@ PLATFORMS
177 183
 DEPENDENCIES
178 184
   appraisal (~> 0.4)
179 185
   aruba
180  
-  coffee-script
181  
-  cucumber-rails (~> 0.5.2)
  186
+  coffee-rails (~> 3.2.1)
  187
+  cucumber-rails (~> 1.2.1)
182 188
   database_cleaner
183 189
   diesel!
  190
+  formtastic (~> 1.2.3)
184 191
   jquery-rails
185  
-  rails (= 3.2.0)
  192
+  rails (= 3.2.1)
186 193
   rspec-rails (~> 2.6.1)
187  
-  sass
188  
-  sqlite3-ruby
  194
+  sass-rails (~> 3.2.3)
  195
+  sqlite3
189 196
   thin
190 197
   turn
191  
-  uglifier
  198
+  uglifier (>= 1.0.3)
1  lib/diesel/testing/application.rb
@@ -13,6 +13,7 @@ class Application < Rails::Application
13 13
         config.paths['app/controllers'] << "#{APP_ROOT}/app/controllers"
14 14
         config.paths['app/views'] << "#{APP_ROOT}/app/views"
15 15
         config.paths['log'] = "tmp/log/development.log"
  16
+        config.assets.enabled = true
16 17
       else
17 18
         config.paths.config.database = "#{APP_ROOT}/config/database.yml"
18 19
         config.paths.config.routes << "#{APP_ROOT}/config/routes.rb"

0 notes on commit bb4e627

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