Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

No more turn in the test application

Rails locks turn gem to 0.8.2 on Ruby <= 1.9.2, while allow >= 0.8.3 on
Ruby 1.9.3 when generate the application. As Appraisal cannot specify
gems based on Ruby version yet, we should just remove turn from our
gemfile.
  • Loading branch information...
commit 2dc7427ae7d3e689f6c8c63ca4a94e1cf32429a2 1 parent caadb84
Prem Sichanugrist sikachu authored
1  Appraisals
@@ -8,7 +8,6 @@ appraise '3.1' do
8 8 gem 'coffee-rails', '~> 3.1.1'
9 9 gem 'uglifier', '>= 1.0.3'
10 10 gem 'jquery-rails'
11   - gem 'turn', '0.8.2'
12 11 end
13 12
14 13 appraise '3.2' do
6 Gemfile.lock
@@ -23,7 +23,6 @@ GEM
23 23 activesupport (3.2.1)
24 24 i18n (~> 0.6)
25 25 multi_json (~> 1.0)
26   - ansi (1.4.2)
27 26 appraisal (0.4.0)
28 27 bundler
29 28 rake
@@ -72,7 +71,6 @@ GEM
72 71 journey (1.0.1)
73 72 json (1.6.5)
74 73 mime-types (1.17.2)
75   - minitest (2.11.1)
76 74 multi_json (1.0.4)
77 75 nokogiri (1.5.0)
78 76 rack (1.4.1)
@@ -124,9 +122,6 @@ GEM
124 122 rack (>= 1.0.0)
125 123 thor (0.14.6)
126 124 tilt (1.3.3)
127   - turn (0.9.1)
128   - ansi
129   - minitest
130 125 xpath (0.1.4)
131 126 nokogiri (~> 1.3)
132 127
@@ -143,4 +138,3 @@ DEPENDENCIES
143 138 rspec-rails (~> 2.6.1)
144 139 sqlite3
145 140 thin
146   - turn
1  diesel.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
26 26 s.add_development_dependency('thin')
27 27 s.add_development_dependency('sqlite3')
28 28 s.add_development_dependency('database_cleaner')
29   - s.add_development_dependency('turn')
30 29 s.add_development_dependency('formtastic', '~> 1.2.3')
31 30
32 31 s.platform = Gem::Platform::RUBY
3  features/features_generator.feature
@@ -68,8 +68,9 @@ Feature: reusable features generator
68 68 end
69 69 """
70 70 When I cd to ".."
71   - And I successfully run `bundle exec rails new testapp`
  71 + And I successfully run `bundle exec rails new testapp --skip-bundle`
72 72 And I cd to "testapp"
  73 + And I comment out gem "turn" from my Gemfile
73 74 And I append to "Gemfile" with:
74 75 """
75 76 gem "capybara"
3  features/install_generator.feature
@@ -74,8 +74,9 @@ Feature: reusable install generator
74 74 <% end -%>
75 75 """
76 76 When I cd to ".."
77   - And I successfully run `bundle exec rails new testapp`
  77 + And I successfully run `bundle exec rails new testapp --skip-bundle`
78 78 And I cd to "testapp"
  79 + And I comment out gem "turn" from my Gemfile
79 80 And I append to "Gemfile" with:
80 81 """
81 82 gem "cucumber-rails"
10 features/integration_testing.feature
@@ -110,8 +110,9 @@ Feature: integration testing
110 110 @puts @announce
111 111 Feature: integrate with application
112 112 Scenario: generate a Rails app, run the generates, and run the tests
113   - When I successfully run `bundle exec rails new testapp --skip-test-unit`
  113 + When I successfully run `bundle exec rails new testapp --skip-test-unit --skip-bundle`
114 114 And I cd to "testapp"
  115 + And I comment out gem "turn" from my Gemfile
115 116 And I add the "cucumber-rails" gem
116 117 And I add the "capybara" gem
117 118 And I add the "rspec-rails" gem
@@ -147,6 +148,13 @@ Feature: integration testing
147 148 ENV[key] = nil
148 149 end
149 150 end
  151 +
  152 + When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
  153 + content = File.read('Gemfile')
  154 + File.open('Gemfile', 'w') do |f|
  155 + f.write content.sub(/gem ['"]#{gem_name}/, '#\1')
  156 + end
  157 + end
150 158 """
151 159 When I reset Bundler environment variable
152 160 When I run `bundle install --local`
6 features/step_definitions/diesel_steps.rb
@@ -15,3 +15,9 @@
15 15 GEM
16 16 end
17 17
  18 +When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
  19 + content = File.read('Gemfile')
  20 + File.open('Gemfile', 'w') do |f|
  21 + f.write content.sub(/gem ['"]#{gem_name}/, '#\1')
  22 + end
  23 +end
3  features/views_generator.feature
@@ -37,8 +37,9 @@ Feature: reusable views generator
37 37 end
38 38 """
39 39 When I cd to ".."
40   - And I successfully run `bundle exec rails new testapp`
  40 + And I successfully run `bundle exec rails new testapp --skip-bundle`
41 41 And I cd to "testapp"
  42 + And I comment out gem "turn" from my Gemfile
42 43 And I add the "testengine" as a diesel engine
43 44 And I reset Bundler environment variable
44 45 And I run `bundle install --local`
4 gemfiles/3.0.gemfile.lock
@@ -34,7 +34,6 @@ GEM
34 34 activemodel (= 3.0.11)
35 35 activesupport (= 3.0.11)
36 36 activesupport (3.0.11)
37   - ansi (1.4.2)
38 37 appraisal (0.4.0)
39 38 bundler
40 39 rake
@@ -143,8 +142,6 @@ GEM
143 142 treetop (1.4.10)
144 143 polyglot
145 144 polyglot (>= 0.3.1)
146   - turn (0.9.2)
147   - ansi
148 145 tzinfo (0.3.31)
149 146 xpath (0.1.4)
150 147 nokogiri (~> 1.3)
@@ -163,4 +160,3 @@ DEPENDENCIES
163 160 rspec-rails (~> 2.6.1)
164 161 sqlite3
165 162 thin
166   - turn
1  gemfiles/3.1.gemfile
@@ -7,6 +7,5 @@ gem "sass-rails", "~> 3.1.5"
7 7 gem "coffee-rails", "~> 3.1.1"
8 8 gem "uglifier", ">= 1.0.3"
9 9 gem "jquery-rails"
10   -gem "turn", "0.8.2"
11 10
12 11 gemspec :path=>"../"
4 gemfiles/3.1.gemfile.lock
@@ -35,7 +35,6 @@ GEM
35 35 activesupport (= 3.1.3)
36 36 activesupport (3.1.3)
37 37 multi_json (~> 1.0)
38   - ansi (1.4.2)
39 38 appraisal (0.4.0)
40 39 bundler
41 40 rake
@@ -171,8 +170,6 @@ GEM
171 170 treetop (1.4.10)
172 171 polyglot
173 172 polyglot (>= 0.3.1)
174   - turn (0.8.2)
175   - ansi (>= 1.2.2)
176 173 tzinfo (0.3.31)
177 174 uglifier (1.2.3)
178 175 execjs (>= 0.3.0)
@@ -197,5 +194,4 @@ DEPENDENCIES
197 194 sass-rails (~> 3.1.5)
198 195 sqlite3
199 196 thin
200   - turn (= 0.8.2)
201 197 uglifier (>= 1.0.3)
4 gemfiles/3.2.gemfile.lock
@@ -34,7 +34,6 @@ GEM
34 34 activesupport (3.2.1)
35 35 i18n (~> 0.6)
36 36 multi_json (~> 1.0)
37   - ansi (1.4.2)
38 37 appraisal (0.4.0)
39 38 bundler
40 39 rake
@@ -168,8 +167,6 @@ GEM
168 167 treetop (1.4.10)
169 168 polyglot
170 169 polyglot (>= 0.3.1)
171   - turn (0.9.2)
172   - ansi
173 170 tzinfo (0.3.31)
174 171 uglifier (1.2.3)
175 172 execjs (>= 0.3.0)
@@ -194,5 +191,4 @@ DEPENDENCIES
194 191 sass-rails (~> 3.2.3)
195 192 sqlite3
196 193 thin
197   - turn
198 194 uglifier (>= 1.0.3)

0 comments on commit 2dc7427

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