summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-25 14:10:09 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-25 21:33:15 -0400
commit3bb2f378168dd18c128ed36ced6ef99bcb271846 (patch)
tree23db0086a367904737466d26325d859488202e2a
parenta64b5e3c60ab1fe295a397422750e026c35aae97 (diff)
downloadgitlab-ce-3bb2f378168dd18c128ed36ced6ef99bcb271846.tar.gz
Add capybara-screenshot gem
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock5
2 files changed, 6 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 460a0f93a96..3e1fa01675a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -223,14 +223,13 @@ end
group :development, :test do
gem 'coveralls', require: false
gem 'rubocop', '0.28.0', require: false
- # gem 'rails-dev-tweaks'
gem 'spinach-rails'
gem "rspec-rails", '2.99'
- gem "capybara", '~> 2.2.1'
+ gem 'capybara', '~> 2.2.1'
+ gem 'capybara-screenshot', '~> 1.0.0'
gem "pry-rails"
gem "awesome_print"
gem "database_cleaner"
- gem "launchy"
gem 'factory_girl_rails'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
diff --git a/Gemfile.lock b/Gemfile.lock
index f0f8601a760..2260beb0a5e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,6 +85,9 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
+ capybara-screenshot (1.0.9)
+ capybara (>= 1.0, < 3)
+ launchy
carrierwave (0.9.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
@@ -677,6 +680,7 @@ DEPENDENCIES
byebug
cal-heatmap-rails (~> 0.0.1)
capybara (~> 2.2.1)
+ capybara-screenshot (~> 1.0.0)
carrierwave
charlock_holmes
coffee-rails
@@ -726,7 +730,6 @@ DEPENDENCIES
jquery-turbolinks
jquery-ui-rails
kaminari (~> 0.15.1)
- launchy
letter_opener
minitest (~> 5.3.0)
mousetrap-rails