diff options
author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-17 15:23:00 -0700 |
---|---|---|
committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-17 15:23:12 -0700 |
commit | d1cc24f6e7eb8ea5b29f0611eaa8246f9d7d4d25 (patch) | |
tree | c1c87b0abd0ad433506e2736a97ad92caa6901ca /spec | |
parent | f9e44f041b3fdc120b1c78554c35c83f7517152e (diff) | |
download | puppet-d1cc24f6e7eb8ea5b29f0611eaa8246f9d7d4d25.tar.gz puppet-d1cc24f6e7eb8ea5b29f0611eaa8246f9d7d4d25.tar.xz puppet-d1cc24f6e7eb8ea5b29f0611eaa8246f9d7d4d25.zip |
maint: fix spec_helper inclusions again.
We got rid of the '../../spec_helper' style requires, but a few of them snuck
back in in recent changes. This purges them out, replaced with the header:
#!/usr/bin/env rspec
require 'spec_helper'
Reviewed-By: Nick Lewis <nick@puppetlabs.com>
Diffstat (limited to 'spec')
-rwxr-xr-x | spec/unit/application/device_spec.rb | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | spec/unit/indirector/facts/network_device_spec.rb | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | spec/unit/provider/cisco_spec.rb | 7 | ||||
-rwxr-xr-x | spec/unit/provider/interface/cisco_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/provider/network_device_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/provider/package/pkgutil_spec.rb | 5 | ||||
-rwxr-xr-x | spec/unit/provider/vlan/cisco_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/type/interface_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/type/vlan_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/util/network_device/cisco/device_spec.rb | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | spec/unit/util/network_device/cisco/facts_spec.rb | 5 | ||||
-rwxr-xr-x | spec/unit/util/network_device/cisco/interface_spec.rb | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | spec/unit/util/network_device/config_spec.rb | 7 | ||||
-rwxr-xr-x | spec/unit/util/network_device/ipcalc_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/util/network_device/transport/base_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/util/network_device/transport/ssh_spec.rb | 3 | ||||
-rwxr-xr-x | spec/unit/util/network_device/transport/telnet_spec.rb | 3 |
17 files changed, 25 insertions, 45 deletions
diff --git a/spec/unit/application/device_spec.rb b/spec/unit/application/device_spec.rb index df8cd3eaf..464827e3c 100755 --- a/spec/unit/application/device_spec.rb +++ b/spec/unit/application/device_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + '/../../spec_helper' +#!/usr/bin/env rspec +require 'spec_helper' require 'puppet/application/device' require 'puppet/util/network_device/config' diff --git a/spec/unit/indirector/facts/network_device_spec.rb b/spec/unit/indirector/facts/network_device_spec.rb index 302a810e8..93cd35d77 100644..100755 --- a/spec/unit/indirector/facts/network_device_spec.rb +++ b/spec/unit/indirector/facts/network_device_spec.rb @@ -1,9 +1,5 @@ -#!/usr/bin/env ruby -# -# Created by Luke Kanies on 2007-9-23. -# Copyright (c) 2007. All rights reserved. - -require File.dirname(__FILE__) + '/../../../spec_helper' +#!/usr/bin/env rspec +require 'spec_helper' require 'puppet/indirector/facts/network_device' diff --git a/spec/unit/provider/cisco_spec.rb b/spec/unit/provider/cisco_spec.rb index 08320731c..0696221c4 100644..100755 --- a/spec/unit/provider/cisco_spec.rb +++ b/spec/unit/provider/cisco_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + '/../../spec_helper' +#!/usr/bin/env rspec +require 'spec_helper' require 'puppet/provider/cisco' @@ -13,4 +12,4 @@ describe Puppet::Provider::Cisco do Puppet::Util::NetworkDevice::Cisco::Device.expects(:new).returns :device Puppet::Provider::Cisco.device(:url).should == :device end -end
\ No newline at end of file +end diff --git a/spec/unit/provider/interface/cisco_spec.rb b/spec/unit/provider/interface/cisco_spec.rb index c18f87cf8..3d400ea4b 100755 --- a/spec/unit/provider/interface/cisco_spec.rb +++ b/spec/unit/provider/interface/cisco_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../spec_helper' +require 'spec_helper' require 'puppet/provider/interface/cisco' diff --git a/spec/unit/provider/network_device_spec.rb b/spec/unit/provider/network_device_spec.rb index e2a87cf4e..aae6ad68a 100755 --- a/spec/unit/provider/network_device_spec.rb +++ b/spec/unit/provider/network_device_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../spec_helper' +require 'spec_helper' require 'puppet/provider/network_device' require 'ostruct' diff --git a/spec/unit/provider/package/pkgutil_spec.rb b/spec/unit/provider/package/pkgutil_spec.rb index 5549b3f6d..dcae21250 100755 --- a/spec/unit/provider/package/pkgutil_spec.rb +++ b/spec/unit/provider/package/pkgutil_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + '/../../../spec_helper' +#!/usr/bin/env rspec +require 'spec_helper' provider = Puppet::Type.type(:package).provider(:pkgutil) diff --git a/spec/unit/provider/vlan/cisco_spec.rb b/spec/unit/provider/vlan/cisco_spec.rb index a67290eb4..4753cea21 100755 --- a/spec/unit/provider/vlan/cisco_spec.rb +++ b/spec/unit/provider/vlan/cisco_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../spec_helper' +require 'spec_helper' require 'puppet/provider/vlan/cisco' diff --git a/spec/unit/type/interface_spec.rb b/spec/unit/type/interface_spec.rb index 12ba225d9..74e3257f6 100755 --- a/spec/unit/type/interface_spec.rb +++ b/spec/unit/type/interface_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../spec_helper' +require 'spec_helper' describe Puppet::Type.type(:interface) do diff --git a/spec/unit/type/vlan_spec.rb b/spec/unit/type/vlan_spec.rb index 3bee14bbd..7d7a0b178 100755 --- a/spec/unit/type/vlan_spec.rb +++ b/spec/unit/type/vlan_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../spec_helper' +require 'spec_helper' describe Puppet::Type.type(:vlan) do diff --git a/spec/unit/util/network_device/cisco/device_spec.rb b/spec/unit/util/network_device/cisco/device_spec.rb index 8971205d3..1c5a1a6c5 100755 --- a/spec/unit/util/network_device/cisco/device_spec.rb +++ b/spec/unit/util/network_device/cisco/device_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../../spec_helper' +require 'spec_helper' require 'puppet/util/network_device/cisco/device' diff --git a/spec/unit/util/network_device/cisco/facts_spec.rb b/spec/unit/util/network_device/cisco/facts_spec.rb index bb29ac292..66842fdf0 100644..100755 --- a/spec/unit/util/network_device/cisco/facts_spec.rb +++ b/spec/unit/util/network_device/cisco/facts_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + '/../../../../spec_helper' +#!/usr/bin/env rspec +require 'spec_helper' require 'puppet/util/network_device' require 'puppet/util/network_device/cisco/facts' diff --git a/spec/unit/util/network_device/cisco/interface_spec.rb b/spec/unit/util/network_device/cisco/interface_spec.rb index 24217750c..b0561c6fd 100755 --- a/spec/unit/util/network_device/cisco/interface_spec.rb +++ b/spec/unit/util/network_device/cisco/interface_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../../spec_helper' +require 'spec_helper' require 'puppet/util/network_device' require 'puppet/util/network_device/cisco/interface' diff --git a/spec/unit/util/network_device/config_spec.rb b/spec/unit/util/network_device/config_spec.rb index 52796f30b..d69358a92 100644..100755 --- a/spec/unit/util/network_device/config_spec.rb +++ b/spec/unit/util/network_device/config_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -require File.dirname(__FILE__) + '/../../../spec_helper' +#!/usr/bin/env rspec +require 'spec_helper' require 'puppet/util/network_device/config' @@ -99,4 +98,4 @@ describe Puppet::Util::NetworkDevice::Config do end end -end
\ No newline at end of file +end diff --git a/spec/unit/util/network_device/ipcalc_spec.rb b/spec/unit/util/network_device/ipcalc_spec.rb index 0418c6a84..82c5390a4 100755 --- a/spec/unit/util/network_device/ipcalc_spec.rb +++ b/spec/unit/util/network_device/ipcalc_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../spec_helper' +require 'spec_helper' require 'puppet/util/network_device/ipcalc' diff --git a/spec/unit/util/network_device/transport/base_spec.rb b/spec/unit/util/network_device/transport/base_spec.rb index c186d72e5..f05a62fbb 100755 --- a/spec/unit/util/network_device/transport/base_spec.rb +++ b/spec/unit/util/network_device/transport/base_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../../spec_helper' +require 'spec_helper' require 'puppet/util/network_device/transport/base' diff --git a/spec/unit/util/network_device/transport/ssh_spec.rb b/spec/unit/util/network_device/transport/ssh_spec.rb index 8fc357db3..04a86ba3f 100755 --- a/spec/unit/util/network_device/transport/ssh_spec.rb +++ b/spec/unit/util/network_device/transport/ssh_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../../spec_helper' +require 'spec_helper' require 'puppet/util/network_device/transport/ssh' diff --git a/spec/unit/util/network_device/transport/telnet_spec.rb b/spec/unit/util/network_device/transport/telnet_spec.rb index 7528e0740..cea5ab79a 100755 --- a/spec/unit/util/network_device/transport/telnet_spec.rb +++ b/spec/unit/util/network_device/transport/telnet_spec.rb @@ -1,6 +1,5 @@ #!/usr/bin/env rspec - -require File.dirname(__FILE__) + '/../../../../spec_helper' +require 'spec_helper' require 'puppet/util/network_device/transport/telnet' |