Skip to content

Commit

Permalink
removed rspec-fire since rspec3 includes it
Browse files Browse the repository at this point in the history
Signed-off-by: dmitriy kalinin <[email protected]>
  • Loading branch information
Rob Day-Reynolds authored and dmitriy kalinin committed Dec 27, 2013
1 parent 30f0ee5 commit c865be9
Show file tree
Hide file tree
Showing 21 changed files with 27 additions and 125 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ group :development, :test do

gem 'rspec', '3.0.0.beta1'
gem 'rspec-its'
gem 'rspec-fire'
gem 'rspec-instafail'

gem 'rubocop', require: false
Expand Down
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,6 @@ GEM
rspec-expectations (3.0.0.beta1)
diff-lcs (>= 1.1.3, < 2.0)
rspec-support (= 3.0.0.beta1)
rspec-fire (1.3.0)
rspec (>= 2.11, < 4)
rspec-instafail (0.2.4)
rspec-its (1.0.0.pre)
rspec-mocks (3.0.0.beta1)
Expand Down Expand Up @@ -458,7 +456,6 @@ DEPENDENCIES
redis
rest-client
rspec (= 3.0.0.beta1)
rspec-fire
rspec-instafail
rspec-its
rubocop
Expand Down
2 changes: 0 additions & 2 deletions bat/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
require 'fakefs/spec_helpers'

SPEC_ROOT = File.expand_path(File.dirname(__FILE__))

Dir.glob(File.expand_path('support/**/*.rb', SPEC_ROOT)).each { |f| require(f) }
9 changes: 0 additions & 9 deletions bat/spec/support/rspec_fire.rb

This file was deleted.

1 change: 0 additions & 1 deletion blobstore_client/blobstore_client.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ Gem::Specification.new do |s|
s.add_dependency 'bosh_common', "~>#{version}"

s.add_development_dependency 'rspec'
s.add_development_dependency 'rspec-fire'
end
15 changes: 4 additions & 11 deletions blobstore_client/spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
require 'rspec'
require 'rspec/fire'
require 'blobstore_client'

require 'erb'
require 'tempfile'

require File.expand_path('../support/shared_examples/base', __FILE__)

RSpec.configure do |config|
config.raise_errors_for_deprecations!
end

def asset(filename)
File.expand_path(File.join(File.dirname(__FILE__), 'assets', filename))
end
Expand All @@ -17,12 +19,3 @@ def erb_asset(filename, binding)
file.flush
file
end

RSpec.configure do |config|
config.include(RSpec::Fire)
config.raise_errors_for_deprecations!
end

RSpec::Fire.configure do |config|
config.verify_constant_names = true
end
1 change: 0 additions & 1 deletion bosh-core/bosh-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'rake'
spec.add_development_dependency 'rspec'
spec.add_development_dependency 'rspec-fire'
end
3 changes: 1 addition & 2 deletions bosh-dev/spec/bosh/dev/shipit_lifecycle_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ module Bosh::Dev
Rugged::Repository.stub(:new).with(repo_path).and_return(repository)
end

# rspec-fire is not happy with Repository#new method defined by c ext in Rugged
let(:repository) { double('Rugged::Repository', head: head_reference) }
let(:repository) { instance_double('Rugged::Repository', head: head_reference) }
let(:head_reference) { instance_double('Rugged::Reference', name: 'refs/heads/this-branch') }

describe '#pull' do
Expand Down
5 changes: 2 additions & 3 deletions bosh-director/bosh-director.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ Gem::Specification.new do |s|

s.add_dependency 'bosh_vcloud_cpi', '~> 0.4.9'

s.add_development_dependency 'fakefs'
s.add_development_dependency 'machinist', '~>1.0'
s.add_development_dependency 'rspec'
s.add_development_dependency 'rspec-its'
s.add_development_dependency 'rspec-fire'
s.add_development_dependency 'fakefs'
s.add_development_dependency 'machinist', '~>1.0'

s.bindir = 'bin'
s.executables << 'bosh-director'
Expand Down
32 changes: 0 additions & 32 deletions bosh-director/spec/support/rspec_fire.rb

This file was deleted.

36 changes: 18 additions & 18 deletions bosh_agent/bosh_agent.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ Gem::Specification.new do |s|
s.required_ruby_version = Gem::Requirement.new('>= 1.9.3')

# Third party dependencies
s.add_dependency 'netaddr', '~>1.5.0'
s.add_dependency 'thin', '~>1.5.0'
s.add_dependency 'yajl-ruby', '~>1.1.0'
s.add_dependency 'sinatra', '~>1.4.2'
s.add_dependency 'nats', '~>0.4.28'
s.add_dependency 'sigar', '~>0.7.2'
s.add_dependency 'httpclient', '=2.2.4'
s.add_dependency 'syslog_protocol', '~>0.9.2'
s.add_dependency 'crack', '~>0.3.2'
s.add_dependency 'netaddr', '~>1.5.0'
s.add_dependency 'thin', '~>1.5.0'
s.add_dependency 'yajl-ruby', '~>1.1.0'
s.add_dependency 'sinatra', '~>1.4.2'
s.add_dependency 'nats', '~>0.4.28'
s.add_dependency 'sigar', '~>0.7.2'
s.add_dependency 'httpclient', '=2.2.4'
s.add_dependency 'syslog_protocol', '~>0.9.2'
s.add_dependency 'crack', '~>0.3.2'

# Bosh Dependencies
s.add_dependency 'bosh-core', "~>#{version}"
s.add_dependency 'bosh_common', "~>#{version}"
s.add_dependency 'blobstore_client', "~>#{version}"
s.add_dependency 'bosh-core', "~>#{version}"
s.add_dependency 'bosh_common', "~>#{version}"
s.add_dependency 'blobstore_client', "~>#{version}"

s.add_development_dependency 'rspec'
s.add_development_dependency 'fakefs'
s.add_development_dependency 'rspec-fire'

s.files = `git ls-files -- lib/*`.split("\n") + %w(CHANGELOG)
s.require_paths = %w(lib)
s.test_files = s.files.grep(%r{^(test|spec|features)/})
s.bindir = 'bin'
s.executables << 'bosh_agent'
s.files = `git ls-files -- lib/*`.split("\n") + %w(CHANGELOG)
s.require_paths = %w(lib)
s.test_files = s.files.grep(%r{^(test|spec|features)/})
s.bindir = 'bin'
s.executables << 'bosh_agent'
end
9 changes: 0 additions & 9 deletions bosh_agent/spec/support/rspec_fire.rb

This file was deleted.

3 changes: 1 addition & 2 deletions bosh_cli/bosh_cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ Gem::Specification.new do |s|
s.add_dependency 'netaddr', '~>1.5.0'
s.add_dependency 'minitar', '~>0.5.4'

s.add_development_dependency 'fakefs'
s.add_development_dependency 'rspec'
s.add_development_dependency 'rspec-its'
s.add_development_dependency 'rspec-fire'
s.add_development_dependency 'fakefs'
s.add_development_dependency 'webmock'
end
9 changes: 0 additions & 9 deletions bosh_cli/spec/support/rspec_fire.rb

This file was deleted.

1 change: 0 additions & 1 deletion bosh_cli_plugin_aws/bosh_cli_plugin_aws.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ Gem::Specification.new do |s|

s.add_development_dependency 'rspec'
s.add_development_dependency 'rspec-its'
s.add_development_dependency 'rspec-fire'
end
9 changes: 0 additions & 9 deletions bosh_cli_plugin_aws/spec/support/rspec_fire.rb

This file was deleted.

2 changes: 1 addition & 1 deletion bosh_cli_plugin_micro/bosh_cli_plugin_micro.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ Gem::Specification.new do |s|
s.add_dependency 'bosh_vcloud_cpi', '~> 0.4.9'
s.add_dependency 'bosh_vsphere_cpi', "~>#{version}"

s.add_development_dependency 'rspec'
s.add_development_dependency 'fakefs'
s.add_development_dependency 'rspec-fire'
end
5 changes: 0 additions & 5 deletions bosh_cli_plugin_micro/spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'rspec'
require 'rspec/fire'
require 'cli'
require 'bosh/cli/commands/micro'
require 'fakefs/spec_helpers'
Expand Down Expand Up @@ -28,7 +27,3 @@ def internal_to(*args, &block)
RSpec.configure do |c|
c.fail_fast = true if ENV['BOSH_DEPLOYER_DIR']
end

RSpec.configure do |config|
config.include(RSpec::Fire)
end
1 change: 0 additions & 1 deletion bosh_vsphere_cpi/bosh_vsphere_cpi.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ Gem::Specification.new do |s|
s.add_dependency 'sequel', '~>3.43.0'

s.add_development_dependency 'rspec'
s.add_development_dependency 'rspec-fire'
end
5 changes: 0 additions & 5 deletions bosh_vsphere_cpi/spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'rspec'
require 'rspec/fire'
require 'sequel'
require 'sequel/adapters/sqlite'

Expand All @@ -23,7 +22,3 @@ class VSphereSpecConfig

Bosh::Clouds::Config.configure(config)
VSphereCloud::Config.logger = config.logger

RSpec.configure do |config|
config.include(RSpec::Fire)
end
Binary file removed vendor/cache/rspec-fire-1.3.0.gem
Binary file not shown.

0 comments on commit c865be9

Please sign in to comment.