Fixing rspec + cucumber environments/helpers for upgrades to latest v…

…ersions

Gemfile.lock

@@ -28,6 +28,7 @@ GEM
     httparty (0.5.2)
       crack (= 0.1.6)
     json (1.4.6)
+    rake (0.8.7)
     rspec (2.0.0.rc)
       rspec-core (= 2.0.0.rc)
       rspec-expectations (= 2.0.0.rc)
@@ -52,6 +53,7 @@ DEPENDENCIES
   httparty (~> 0.5.2)
   hudson!
   json (~> 1.4.0)
+  rake (~> 0.8.7)
   rspec (~> 2.0.0.beta)
   term-ansicolor (>= 1.0.4)
   thor (= 0.14.2)

Rakefile

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency("builder", ["~> 2.1.2"])
   s.add_dependency("thor", ["= 0.14.2"])
   s.add_dependency("hpricot")
+  s.add_development_dependency("rake", ["~> 0.8.7"])
   s.add_development_dependency("cucumber", ["~> 0.9.0"])
   s.add_development_dependency("rspec", ["~> 2.0.0.beta"])
   s.add_development_dependency("json", ["~>1.4.0"])

features/support/env.rb

@@ -1,10 +1,7 @@
 $:.unshift(File.expand_path(File.dirname(File.dirname(__FILE__) + "/../../lib/hudson.rb")))
 require File.dirname(__FILE__) + "/../../lib/hudson.rb"
 
-gem 'cucumber'
-require 'cucumber'
-gem 'rspec'
-require 'spec'
+require 'bundler/setup'
 
 Before do
   @tmp_root = File.dirname(__FILE__) + "/../../tmp"

features/support/matchers.rb

@@ -1,10 +1,8 @@
 
 module Matchers
-  def contain(expected)
-    Spec::Matchers::SimpleMatcher.new("contain #{expected.inspect}") do |given, matcher|
-      matcher.failure_message = "expected #{given.inspect} to contain #{expected.inspect}"
-      matcher.negative_failure_message = "expected #{given.inspect} not to contain #{expected.inspect}"
-      given.index expected
+  RSpec::Matchers.define :contain do |expected_text|
+    match do |text|
+      text.index expected_text
     end
   end
 end

hudson.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_runtime_dependency(%q<thor>, ["= 0.14.2"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<cucumber>, ["~> 0.9.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta"])
       s.add_development_dependency(%q<json>, ["~> 1.4.0"])
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_dependency(%q<thor>, ["= 0.14.2"])
       s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<cucumber>, ["~> 0.9.0"])
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta"])
       s.add_dependency(%q<json>, ["~> 1.4.0"])
@@ -50,6 +52,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, ["~> 2.1.2"])
     s.add_dependency(%q<thor>, ["= 0.14.2"])
     s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<cucumber>, ["~> 0.9.0"])
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta"])
     s.add_dependency(%q<json>, ["~> 1.4.0"])

spec/spec_helper.rb

@@ -1,9 +1,9 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')