From 8aa4d8e0e8b276e123022e236d1f92d90ac2c6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 2 Mar 2013 21:53:14 +0100
Subject: [PATCH] bump cucumber-rails
---
Gemfile | 2 +-
Gemfile.lock | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Gemfile b/Gemfile
index 27a841070a..2fd85953c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -182,7 +182,7 @@ group :test do
# Cucumber (integration tests)
gem 'capybara', '1.1.3'
- gem 'cucumber-rails', '1.3.0', :require => false
+ gem 'cucumber-rails', '1.3.1', :require => false
gem 'database_cleaner', '0.9.1'
gem 'selenium-webdriver', '2.31.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index dd9345129f..22deb4b26f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,15 +82,16 @@ GEM
compass (>= 0.12.2, < 0.14)
configurate (0.0.2)
crack (0.3.2)
- cucumber (1.2.1)
+ cucumber (1.2.3)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
- gherkin (~> 2.11.0)
- json (>= 1.4.6)
- cucumber-rails (1.3.0)
+ gherkin (~> 2.11.6)
+ multi_json (~> 1.3)
+ cucumber-rails (1.3.1)
capybara (>= 1.1.2)
- cucumber (>= 1.1.8)
+ cucumber (>= 1.2.0)
nokogiri (>= 1.5.0)
+ rails (~> 3.0)
database_cleaner (0.9.1)
devise (2.1.3)
bcrypt-ruby (~> 3.0)
@@ -425,7 +426,7 @@ DEPENDENCIES
client_side_validations (= 3.2.2)
compass-rails (= 1.0.3)
configurate (= 0.0.2)
- cucumber-rails (= 1.3.0)
+ cucumber-rails (= 1.3.1)
database_cleaner (= 0.9.1)
devise (= 2.1.3)
factory_girl_rails (= 4.2.1)
--
GitLab