Quiet tests

hechien · Jan 31, 2011 · 120c74e · 120c74e
1 parent ce4c1af
commit 120c74e
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,10 +7,10 @@ gem "bourne"
 gem "webmock"
 gem "rake"
 gem "sham_rack"
-gem "cucumber"
+gem "cucumber", "~> 0.10.0"
 gem "sinatra", :require => false
 gem "yard", :require => false
-gem "aruba"
+gem "aruba", "~> 0.3.2"
 gem "ruby-debug"
 gem "json"
 gem "thin"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,13 +33,15 @@ GEM
       bundler
       rake
     arel (2.0.6)
-    aruba (0.2.7)
-      background_process
+    aruba (0.3.2)
+      childprocess (~> 0.1.6)
       cucumber (~> 0.10.0)
-    background_process (1.2)
+      rspec (~> 2.3.0)
     bourne (1.0)
       mocha (= 0.9.8)
     builder (2.1.2)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
     columnize (0.3.2)
     crack (0.1.8)
     cucumber (0.10.0)
@@ -53,6 +55,8 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
     gherkin (2.3.3)
       json (~> 1.4.6)
     i18n (0.5.0)
@@ -125,9 +129,9 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  aruba
+  aruba (~> 0.3.2)
   bourne
-  cucumber
+  cucumber (~> 0.10.0)
   i18n
   json
   rails (~> 3.0.3)

diff --git a/features/rails.feature b/features/rails.feature
@@ -1,4 +1,4 @@
-@disable-bundler @puts @announce
+@disable-bundler
 Feature: Using copycopter in a rails app
 
   Background:

diff --git a/features/step_definitions/rails_steps.rb b/features/step_definitions/rails_steps.rb
@@ -19,7 +19,7 @@
 end
 
 When /^I configure the copycopter client with api key "([^"]*)"$/ do |api_key|
-  create_file("config/initializers/copycopter.rb", <<-RUBY)
+  write_file("config/initializers/copycopter.rb", <<-RUBY)
     CopycopterClient.configure do |config|
       config.api_key = "#{api_key}"
       config.polling_delay = 1
@@ -131,7 +131,7 @@
 
   routes = "#{draw}resources :#{resource}\nend"
 
-  create_file("config/routes.rb", routes, false)
+  overwrite_file("config/routes.rb", routes)
 end
 
 When /^I run a short lived process that sets the key "([^"]*)" to "([^"]*)"$/ do |key, value|

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -6,3 +6,7 @@
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 require "copycopter_client/version"
 
+Before do
+  @aruba_timeout_seconds = 15
+end
+
diff --git a/features/support/rails_server.rb b/features/support/rails_server.rb
@@ -28,6 +28,12 @@ def self.post(path, data)
   end
 
   def self.run(port, silent)
+    if silent
+      require 'stringio'
+      $stdout = StringIO.new
+      $stderr = StringIO.new
+    end
+
     require 'config/environment'
     require 'thin'
 

diff --git a/gemfiles/2.3.gemfile b/gemfiles/2.3.gemfile
@@ -9,11 +9,11 @@ gem "bourne"
 gem "sham_rack"
 gem "rspec", "~> 2.3"
 gem "yard", {:require=>false}
-gem "aruba"
+gem "aruba", "~> 0.3.2"
 gem "thin"
 gem "sinatra", {:require=>false}
 gem "json"
-gem "cucumber"
+gem "cucumber", "~> 0.10.0"
 gem "i18n"
 gem "appraisal", {:require=>false}
 gem "webmock"
diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock
@@ -15,27 +15,30 @@ GEM
     appraisal (0.1)
       bundler
       rake
-    aruba (0.2.5)
-      background_process
-      cucumber (~> 0.9.4)
-    background_process (1.2)
+    aruba (0.3.2)
+      childprocess (~> 0.1.6)
+      cucumber (~> 0.10.0)
+      rspec (~> 2.3.0)
     bourne (1.0)
       mocha (= 0.9.8)
-    builder (2.1.2)
+    builder (3.0.0)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
     columnize (0.3.1)
     crack (0.1.8)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
+      gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     daemons (1.1.0)
     diff-lcs (1.1.2)
     eventmachine (0.12.10)
-    gherkin (2.2.9)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
     i18n (0.4.2)
     json (1.4.6)
     linecache (0.43)
@@ -84,9 +87,9 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  aruba
+  aruba (~> 0.3.2)
   bourne
-  cucumber
+  cucumber (~> 0.10.0)
   i18n
   json
   rails (~> 2.3)

diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
@@ -9,11 +9,11 @@ gem "bourne"
 gem "sham_rack"
 gem "rspec", "~> 2.3"
 gem "yard", {:require=>false}
-gem "aruba"
+gem "aruba", "~> 0.3.2"
 gem "thin"
 gem "sinatra", {:require=>false}
 gem "json"
-gem "cucumber"
+gem "cucumber", "~> 0.10.0"
 gem "i18n"
 gem "appraisal", {:require=>false}
 gem "webmock"
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
@@ -33,29 +33,32 @@ GEM
       bundler
       rake
     arel (2.0.6)
-    aruba (0.2.5)
-      background_process
-      cucumber (~> 0.9.4)
-    background_process (1.2)
+    aruba (0.3.2)
+      childprocess (~> 0.1.6)
+      cucumber (~> 0.10.0)
+      rspec (~> 2.3.0)
     bourne (1.0)
       mocha (= 0.9.8)
     builder (2.1.2)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
     columnize (0.3.1)
     crack (0.1.8)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
+      gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     daemons (1.1.0)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
-    gherkin (2.2.9)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
     i18n (0.4.2)
     json (1.4.6)
     linecache (0.43)
@@ -125,9 +128,9 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  aruba
+  aruba (~> 0.3.2)
   bourne
-  cucumber
+  cucumber (~> 0.10.0)
   i18n
   json
   rails (~> 3.0.3)