Skip to content
Extraits de code Groupes Projets
Valider 64b86b27 rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

bump rspec-rails and rspec

fix two specs by not checking for object identity
parent e45ed19c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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
......
......@@ -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)
......
......@@ -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
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter