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.
thoughtbot · Feb 11, 2012 · 2dc7427 · 2dc7427
1 parent caadb84
commit 2dc7427
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 25 deletions.
diff --git a/Appraisals b/Appraisals
@@ -8,7 +8,6 @@ appraise '3.1' do
   gem 'coffee-rails', '~> 3.1.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'jquery-rails'
-  gem 'turn', '0.8.2'
 end
 
 appraise '3.2' do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -23,7 +23,6 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    ansi (1.4.2)
     appraisal (0.4.0)
       bundler
       rake
@@ -72,7 +71,6 @@ GEM
     journey (1.0.1)
     json (1.6.5)
     mime-types (1.17.2)
-    minitest (2.11.1)
     multi_json (1.0.4)
     nokogiri (1.5.0)
     rack (1.4.1)
@@ -124,9 +122,6 @@ GEM
       rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
-    turn (0.9.1)
-      ansi
-      minitest
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -143,4 +138,3 @@ DEPENDENCIES
   rspec-rails (~> 2.6.1)
   sqlite3
   thin
-  turn
diff --git a/diesel.gemspec b/diesel.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('thin')
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('database_cleaner')
-  s.add_development_dependency('turn')
   s.add_development_dependency('formtastic', '~> 1.2.3')
 
   s.platform = Gem::Platform::RUBY

diff --git a/features/features_generator.feature b/features/features_generator.feature
@@ -68,8 +68,9 @@ Feature: reusable features generator
     end
     """
     When I cd to ".."
-    And I successfully run `bundle exec rails new testapp`
+    And I successfully run `bundle exec rails new testapp --skip-bundle`
     And I cd to "testapp"
+    And I comment out gem "turn" from my Gemfile
     And I append to "Gemfile" with:
     """
     gem "capybara"

diff --git a/features/install_generator.feature b/features/install_generator.feature
@@ -74,8 +74,9 @@ Feature: reusable install generator
     <% end -%>
     """
     When I cd to ".."
-    And I successfully run `bundle exec rails new testapp`
+    And I successfully run `bundle exec rails new testapp --skip-bundle`
     And I cd to "testapp"
+    And I comment out gem "turn" from my Gemfile
     And I append to "Gemfile" with:
     """
     gem "cucumber-rails"

diff --git a/features/integration_testing.feature b/features/integration_testing.feature
@@ -110,8 +110,9 @@ Feature: integration testing
     @puts @announce
     Feature: integrate with application
       Scenario: generate a Rails app, run the generates, and run the tests
-        When I successfully run `bundle exec rails new testapp --skip-test-unit`
+        When I successfully run `bundle exec rails new testapp --skip-test-unit --skip-bundle`
         And I cd to "testapp"
+        And I comment out gem "turn" from my Gemfile
         And I add the "cucumber-rails" gem
         And I add the "capybara" gem
         And I add the "rspec-rails" gem
@@ -147,6 +148,13 @@ Feature: integration testing
         ENV[key] = nil
       end
     end
+
+    When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
+      content = File.read('Gemfile')
+      File.open('Gemfile', 'w') do |f|
+        f.write content.sub(/gem ['"]#{gem_name}/, '#\1')
+      end
+    end
     """
     When I reset Bundler environment variable
     When I run `bundle install --local`

diff --git a/features/step_definitions/diesel_steps.rb b/features/step_definitions/diesel_steps.rb
@@ -15,3 +15,9 @@
   GEM
 end
 
+When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
+  content = File.read('Gemfile')
+  File.open('Gemfile', 'w') do |f|
+    f.write content.sub(/gem ['"]#{gem_name}/, '#\1')
+  end
+end
diff --git a/features/views_generator.feature b/features/views_generator.feature
@@ -37,8 +37,9 @@ Feature: reusable views generator
     end
     """
     When I cd to ".."
-    And I successfully run `bundle exec rails new testapp`
+    And I successfully run `bundle exec rails new testapp --skip-bundle`
     And I cd to "testapp"
+    And I comment out gem "turn" from my Gemfile
     And I add the "testengine" as a diesel engine
     And I reset Bundler environment variable
     And I run `bundle install --local`

diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
@@ -34,7 +34,6 @@ GEM
       activemodel (= 3.0.11)
       activesupport (= 3.0.11)
     activesupport (3.0.11)
-    ansi (1.4.2)
     appraisal (0.4.0)
       bundler
       rake
@@ -143,8 +142,6 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.9.2)
-      ansi
     tzinfo (0.3.31)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -163,4 +160,3 @@ DEPENDENCIES
   rspec-rails (~> 2.6.1)
   sqlite3
   thin
-  turn
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
@@ -7,6 +7,5 @@ gem "sass-rails", "~> 3.1.5"
 gem "coffee-rails", "~> 3.1.1"
 gem "uglifier", ">= 1.0.3"
 gem "jquery-rails"
-gem "turn", "0.8.2"
 
 gemspec :path=>"../"
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
@@ -35,7 +35,6 @@ GEM
       activesupport (= 3.1.3)
     activesupport (3.1.3)
       multi_json (~> 1.0)
-    ansi (1.4.2)
     appraisal (0.4.0)
       bundler
       rake
@@ -171,8 +170,6 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.8.2)
-      ansi (>= 1.2.2)
     tzinfo (0.3.31)
     uglifier (1.2.3)
       execjs (>= 0.3.0)
@@ -197,5 +194,4 @@ DEPENDENCIES
   sass-rails (~> 3.1.5)
   sqlite3
   thin
-  turn (= 0.8.2)
   uglifier (>= 1.0.3)
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
@@ -34,7 +34,6 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    ansi (1.4.2)
     appraisal (0.4.0)
       bundler
       rake
@@ -168,8 +167,6 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.9.2)
-      ansi
     tzinfo (0.3.31)
     uglifier (1.2.3)
       execjs (>= 0.3.0)
@@ -194,5 +191,4 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   sqlite3
   thin
-  turn
   uglifier (>= 1.0.3)