Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge pull request #256 from JonRowe/dumb_fix_for_rails4_test_he... #258

Merged
merged 1 commit into from
Aug 13, 2013
Merged

Revert "Merge pull request #256 from JonRowe/dumb_fix_for_rails4_test_he... #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cucumber-rails.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('cucumber', '>= 1.2.0')
s.add_runtime_dependency('nokogiri', '>= 1.5.0')
s.add_runtime_dependency('capybara', '>= 1.1.2')
s.add_runtime_dependency('rails', '>= 3.0')
s.add_runtime_dependency('rails', '~> 3.0')

# Main development dependencies
s.add_development_dependency('rake', '>= 0.9.2.2')
Expand Down
14 changes: 2 additions & 12 deletions lib/cucumber/rails.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,11 @@
require File.expand_path(ENV["RAILS_ROOT"] + '/config/environment')
require 'cucumber/rails/action_controller'

require 'action_dispatch/testing/integration'

if defined?(ActiveRecord::Base)
class ActiveSupport::TestCase
include ActiveRecord::TestFixtures
self.fixture_path = "#{Rails.root}/test/fixtures/"
end

ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path

def create_fixtures(*fixture_set_names, &block)
FixtureSet.create_fixtures(ActiveSupport::TestCase.fixture_path, fixture_set_names, {}, &block)
end
require 'rails/test_help'
else
require 'action_dispatch/testing/test_process'
require 'action_dispatch/testing/integration'
end

if !Rails.application.config.cache_classes
Expand Down