Permalink
Browse files

all tests pass now

  • Loading branch information...
1 parent 816ae39 commit a2f2c69f272312bce2ce9bb45117e689813a3bb6 @adamgamble adamgamble committed Dec 26, 2012
Showing with 8 additions and 3 deletions.
  1. +1 −1 features/step_definitions/file_attachment_steps.rb
  2. +7 −2 features/support/env.rb
View
2 features/step_definitions/file_attachment_steps.rb
@@ -3,6 +3,6 @@
end
When /^I attach a file$/ do
- attach_file("file_attachment[attachment_file]", File.join(::Rails.root.to_s, 'features', 'step_definitions', 'file_attachment_steps.rb'))
+ attach_file("file_attachment[attachment_file]", File.join(::Rails.root.to_s,'..', '..', 'features', 'step_definitions', 'file_attachment_steps.rb'))
end
View
9 features/support/env.rb
@@ -1,4 +1,3 @@
-require 'pry'
# Simplecov Setup
if RUBY_VERSION >= '1.9.2'
require 'simplecov'
@@ -17,7 +16,7 @@
ENV["RAILS_ENV"] ||= 'test'
require 'bundler'
-Bundler.require :default, :development
+Bundler.require :default, :development, :assets
$:.push(File.expand_path('../../../lib', __FILE__))
require 'xrono'
require 'combustion'
@@ -73,3 +72,9 @@ def route_helpers
#
#ActionController::Base.allow_rescue = false
Capybara.app = Rails.application
+Before("@javascript") do
+ Capybara.current_driver = :selenium
+end
+After("@javascript") do
+ Capybara.current_driver = Capybara.default_driver
+end

0 comments on commit a2f2c69

Please sign in to comment.