Skip to content

Commit

Permalink
Merge pull request refinery#1123 from neotericdesign/1-0-stable
Browse files Browse the repository at this point in the history
I decided capybara-webkit is just fine. My system needed Qt installed.
  • Loading branch information
parndt committed Nov 2, 2011
2 parents 767003a + 3625056 commit 41472d0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 6 additions & 1 deletion Gemfile
Expand Up @@ -30,7 +30,12 @@ group :development, :test do
# Then, run 'rails generate refinerycms_testing' which will copy its support files.
# Finally, run 'rake' to run the tests.
gem 'refinerycms-testing', '~> 1.0.8'
gem 'capybara-webkit', '~> 0.6.1'
gem 'capybara-webkit'

if RbConfig::CONFIG['target_os'] =~ /darwin/i
gem 'growl'
end

gem 'spork', '0.9.0.rc9', :platforms => :ruby
gem 'guard-spork', :platforms => :ruby
gem 'guard-rspec', :platforms => :ruby
Expand Down
4 changes: 3 additions & 1 deletion spec/spec_helper.rb
Expand Up @@ -8,7 +8,9 @@ def setup_environment
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'

require 'capybara/rspec'

Capybara.javascript_driver = :webkit
# Requires supporting files with custom matchers and macros, etc,
# in ./support/ and its subdirectories.
Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f}
Expand Down

0 comments on commit 41472d0

Please sign in to comment.