nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump rspec-rails and rspec

Browse source 
fix two specs by not checking for object identity
This commit is contained in:
Jonne Haß 2012-12-06 19:51:23 +01:00
parent e45ed19c33
commit 64b86b27c1
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -162,7 +162,7 @@ group :test do
end end
group :test, :development do group :test, :development do
gem "rspec-rails", "2.11.4" gem "rspec-rails", "2.12.2"
end end
group :development do group :development do

22
Gemfile.lock
View file

@ -335,20 +335,22 @@ GEM
resque-timeout (1.0.0) resque-timeout (1.0.0)
resque (~> 1.0) resque (~> 1.0)
rmagick (2.13.1) rmagick (2.13.1)
rspec (2.11.0) rspec (2.12.0)
rspec-core (~> 2.11.0) rspec-core (~> 2.12.0)
rspec-expectations (~> 2.11.0) rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.11.0) rspec-mocks (~> 2.12.0)
rspec-core (2.11.1) rspec-core (2.12.2)
rspec-expectations (2.11.3) rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rspec-instafail (0.2.4) rspec-instafail (0.2.4)
rspec-mocks (2.11.3) rspec-mocks (2.12.1)
rspec-rails (2.11.4) rspec-rails (2.12.2)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 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-hmac (0.4.0)
ruby-oembed (0.8.7) ruby-oembed (0.8.7)
ruby-progressbar (1.0.2) ruby-progressbar (1.0.2)
@ -477,7 +479,7 @@ DEPENDENCIES
rmagick rmagick
roxml! roxml!
rspec-instafail (= 0.2.4) rspec-instafail (= 0.2.4)
rspec-rails (= 2.11.4) rspec-rails (= 2.12.2)
ruby-oembed (= 0.8.7) ruby-oembed (= 0.8.7)
sass-rails (= 3.2.5) sass-rails (= 3.2.5)
selenium-webdriver (= 2.27.1) selenium-webdriver (= 2.27.1)

6
spec/helpers/application_helper_spec.rb
View file

@ -38,7 +38,7 @@ describe ApplicationHelper do
end end
@current_user = alice @current_user = alice
end end
after do after do
AppConfig.configured_services = @old_configured_services AppConfig.configured_services = @old_configured_services
end end
@ -97,7 +97,7 @@ describe ApplicationHelper do
it 'displays the supplied pod_name if it is set' do it 'displays the supplied pod_name if it is set' do
old_name = AppConfig.settings.pod_name.get old_name = AppConfig.settings.pod_name.get
AppConfig.settings.pod_name = "Catspora" AppConfig.settings.pod_name = "Catspora"
pod_name.should == "Catspora" pod_name.should match "Catspora"
AppConfig.settings.pod_name = old_name AppConfig.settings.pod_name = old_name
end end
end end
@ -107,7 +107,7 @@ describe ApplicationHelper do
it 'displays the supplied pod_version if it is set' do it 'displays the supplied pod_version if it is set' do
old_version = AppConfig.version.number.get old_version = AppConfig.version.number.get
AppConfig.version.number = "0.0.1.0" 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 AppConfig.version.number = old_version
end end
end end