From 9870069c56acebd2f6d90eb2a5d12febab5c38c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Fri, 5 Sep 2014 23:46:56 +0200
Subject: [PATCH] bump rspec
---
Gemfile | 2 +-
Gemfile.lock | 34 +++++++++++++++++-----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Gemfile b/Gemfile
index 4936acef88..ca4d58e687 100644
--- a/Gemfile
+++ b/Gemfile
@@ -213,7 +213,7 @@ end
group :development, :test do
# RSpec (unit tests, some integration tests)
- gem 'rspec-rails', '3.0.2'
+ gem 'rspec-rails', '3.1.0'
# Cucumber (integration tests)
gem 'cucumber-rails', '1.4.1', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 512e96bde7..c3737e6886 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,28 +390,28 @@ GEM
roxml (3.1.6)
activesupport (>= 2.3.0)
nokogiri (>= 1.3.3)
- rspec (3.0.0)
- rspec-core (~> 3.0.0)
- rspec-expectations (~> 3.0.0)
- rspec-mocks (~> 3.0.0)
- rspec-core (3.0.4)
- rspec-support (~> 3.0.0)
- rspec-expectations (3.0.4)
+ rspec (3.1.0)
+ rspec-core (~> 3.1.0)
+ rspec-expectations (~> 3.1.0)
+ rspec-mocks (~> 3.1.0)
+ rspec-core (3.1.1)
+ rspec-support (~> 3.1.0)
+ rspec-expectations (3.1.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.0.0)
+ rspec-support (~> 3.1.0)
rspec-instafail (0.2.5)
rspec
- rspec-mocks (3.0.4)
- rspec-support (~> 3.0.0)
- rspec-rails (3.0.2)
+ rspec-mocks (3.1.0)
+ rspec-support (~> 3.1.0)
+ rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 3.0.0)
- rspec-expectations (~> 3.0.0)
- rspec-mocks (~> 3.0.0)
- rspec-support (~> 3.0.0)
- rspec-support (3.0.4)
+ rspec-core (~> 3.1.0)
+ rspec-expectations (~> 3.1.0)
+ rspec-mocks (~> 3.1.0)
+ rspec-support (~> 3.1.0)
+ rspec-support (3.1.0)
ruby-oembed (0.8.10)
ruby-progressbar (1.5.1)
rubyzip (1.1.6)
@@ -571,7 +571,7 @@ DEPENDENCIES
remotipart (= 1.2.1)
roxml (= 3.1.6)
rspec-instafail (= 0.2.5)
- rspec-rails (= 3.0.2)
+ rspec-rails (= 3.1.0)
ruby-oembed (= 0.8.10)
sass-rails (= 4.0.3)
selenium-webdriver (= 2.42.0)
--
GitLab