From 283b26cc30b88909f8545d20004907bd3f1cc39e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Wed, 27 Feb 2013 13:14:19 +0100
Subject: [PATCH] bump rspec-rails
---
Gemfile | 2 +-
Gemfile.lock | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Gemfile b/Gemfile
index db9f8aa8b5..8353399175 100644
--- a/Gemfile
+++ b/Gemfile
@@ -177,7 +177,7 @@ group :test do
gem 'fixture_builder', '0.3.5'
gem 'fuubar', '1.1.0'
gem 'rspec-instafail', '0.2.4', :require => false
- gem 'rspec-rails', '2.12.2'
+ gem "rspec-rails", '2.13.0'
# Cucumber (integration tests)
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d8af7795e..52bf64a886 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.1)
erubis (2.7.0)
excon (0.20.1)
execjs (1.4.0)
@@ -331,22 +331,22 @@ GEM
roxml (3.1.6)
activesupport (>= 2.3.0)
nokogiri (>= 1.3.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 (2.13.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ rspec-core (2.13.1)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
rspec-instafail (0.2.4)
- rspec-mocks (2.12.2)
- rspec-rails (2.12.2)
+ rspec-mocks (2.13.0)
+ rspec-rails (2.13.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 2.12.0)
- rspec-expectations (~> 2.12.0)
- rspec-mocks (~> 2.12.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
ruby-hmac (0.4.0)
ruby-oembed (0.8.8)
ruby-progressbar (1.0.2)
@@ -477,7 +477,7 @@ DEPENDENCIES
rmagick (= 2.13.2)
roxml (= 3.1.6)
rspec-instafail (= 0.2.4)
- rspec-rails (= 2.12.2)
+ rspec-rails (= 2.13.0)
ruby-oembed (= 0.8.8)
sass-rails (= 3.2.6)
selenium-webdriver (= 2.30.0)
--
GitLab