From 64b86b27c16d0191cc84b13f5fba9f7e86003d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Thu, 6 Dec 2012 19:51:23 +0100
Subject: [PATCH] bump rspec-rails and rspec
fix two specs by not checking for object identity
---
Gemfile | 2 +-
Gemfile.lock | 22 ++++++++++++----------
spec/helpers/application_helper_spec.rb | 6 +++---
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Gemfile b/Gemfile
index c15b456bc5..234fd73f74 100644
--- a/Gemfile
+++ b/Gemfile
@@ -162,7 +162,7 @@ group :test do
end
group :test, :development do
- gem "rspec-rails", "2.11.4"
+ gem "rspec-rails", "2.12.2"
end
group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index e8c7d0c2b3..dd90fa3214 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -335,20 +335,22 @@ GEM
resque-timeout (1.0.0)
resque (~> 1.0)
rmagick (2.13.1)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-instafail (0.2.4)
- rspec-mocks (2.11.3)
- rspec-rails (2.11.4)
+ rspec-mocks (2.12.1)
+ rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.11.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
ruby-hmac (0.4.0)
ruby-oembed (0.8.7)
ruby-progressbar (1.0.2)
@@ -477,7 +479,7 @@ DEPENDENCIES
rmagick
roxml!
rspec-instafail (= 0.2.4)
- rspec-rails (= 2.11.4)
+ rspec-rails (= 2.12.2)
ruby-oembed (= 0.8.7)
sass-rails (= 3.2.5)
selenium-webdriver (= 2.27.1)
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index a33832750a..e58d1bcc2d 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -38,7 +38,7 @@ describe ApplicationHelper do
end
@current_user = alice
end
-
+
after do
AppConfig.configured_services = @old_configured_services
end
@@ -97,7 +97,7 @@ describe ApplicationHelper do
it 'displays the supplied pod_name if it is set' do
old_name = AppConfig.settings.pod_name.get
AppConfig.settings.pod_name = "Catspora"
- pod_name.should == "Catspora"
+ pod_name.should match "Catspora"
AppConfig.settings.pod_name = old_name
end
end
@@ -107,7 +107,7 @@ describe ApplicationHelper do
it 'displays the supplied pod_version if it is set' do
old_version = AppConfig.version.number.get
AppConfig.version.number = "0.0.1.0"
- pod_version.should == "0.0.1.0"
+ pod_version.should match "0.0.1.0"
AppConfig.version.number = old_version
end
end
--
GitLab