summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock2
-rw-r--r--features/support/env.rb5
-rw-r--r--spec/spec_helper.rb6
4 files changed, 14 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 26e4e195def..e8b0b244d1e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -101,6 +101,7 @@ group :development, :test do
gem "rspec-rails"
gem "capybara"
gem "capybara-webkit"
+ gem "headless"
gem "autotest"
gem "autotest-rails"
gem "pry"
diff --git a/Gemfile.lock b/Gemfile.lock
index 57ad193512e..b23bc47c1d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,6 +186,7 @@ GEM
railties (~> 3.0)
hashery (1.4.0)
hashie (1.2.0)
+ headless (0.3.1)
hike (1.2.1)
httparty (0.8.3)
multi_json (~> 1.0)
@@ -398,6 +399,7 @@ DEPENDENCIES
grape (~> 0.2.1)
grit!
haml-rails
+ headless
httparty
jquery-rails (= 2.0.2)
jquery-ui-rails (= 0.5.0)
diff --git a/features/support/env.rb b/features/support/env.rb
index b47349c8ea7..496f23f9894 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -39,3 +39,8 @@ rescue NameError
end
Cucumber::Rails::Database.javascript_strategy = :truncation
+
+require 'headless'
+
+headless = Headless.new
+headless.start
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f87c9a50f86..5c0bb618754 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,6 +12,7 @@ require 'webmock/rspec'
require 'factories'
require 'monkeypatch'
require 'email_spec'
+require 'headless'
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
@@ -30,6 +31,11 @@ RSpec.configure do |config|
# instead of true.
config.use_transactional_fixtures = false
+ config.before :all do
+ headless = Headless.new
+ headless.start
+ end
+
config.before :each, type: :integration do
DeviseSessionMock.disable
end