summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-23 20:12:18 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-23 20:12:18 -0800
commitb0fc24c9bfbcf8a7fdf3723b74810f5615bb4337 (patch)
tree56c3c484b53c5e1b2ee1bae72106c6f92594011a
parenta7ce4b52e9d4f68d02b52b1bc1f8d2a8faf19e17 (diff)
downloadgitlab-shell-b0fc24c9bfbcf8a7fdf3723b74810f5615bb4337.tar.gz
Fix tests
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock20
2 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile b/Gemfile
index fc6af33..7c5ce9d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "http://rubygems.org"
group :development, :test do
gem 'coveralls', require: false
- gem 'rspec'
+ gem 'rspec', '~> 2.14.0'
gem 'webmock'
gem 'guard'
gem 'guard-rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9684ce8..9bf7d9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
term-ansicolor
thor
crack (0.3.1)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.5)
docile (1.1.5)
guard (1.5.4)
listen (>= 0.4.2)
@@ -40,14 +40,14 @@ GEM
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
- 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-mocks (2.12.2)
+ rspec (2.14.1)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ rspec-core (2.14.8)
+ rspec-expectations (2.14.5)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.14.6)
rubocop (0.28.0)
astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0)
@@ -77,7 +77,7 @@ DEPENDENCIES
coveralls
guard
guard-rspec
- rspec
+ rspec (~> 2.14.0)
rubocop (= 0.28.0)
vcr
webmock