spec/spec_helper.rb in cf-5.2.1.rc3 vs spec/spec_helper.rb in cf-5.2.1.rc4

- old
+ new

@@ -8,11 +8,10 @@ require "webmock" require "webmock/rspec" require "ostruct" require "fakefs/safe" require "blue-shell" -require_relative '../vendor/integration-test-support/support/integration_example_group.rb' TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"] OriginalFile = File @@ -28,14 +27,10 @@ Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file| require file end -tmp_dir = File.expand_path('../tmp', File.dirname(__FILE__)) -FileUtils.mkdir_p(tmp_dir) -IntegrationExampleGroup.tmp_dir = tmp_dir - RSpec.configure do |c| c.include BlueShell::Matchers if RUBY_VERSION =~ /^1\.8\.\d/ c.filter_run_excluding :ruby19 => true @@ -44,10 +39,9 @@ c.include FakeHomeDir c.include CliHelper c.include InteractHelper c.include ConfigHelper c.include FeaturesHelper - c.include IntegrationExampleGroup, type: :integration, :example_group => {:file_path => /\/integration\//} c.before(:all) do WebMock.disable_net_connect!(:allow_localhost => true) end