summaryrefslogtreecommitdiffstats
path: root/spec/unit/provider
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-05-17 15:23:00 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-05-17 15:23:12 -0700
commitd1cc24f6e7eb8ea5b29f0611eaa8246f9d7d4d25 (patch)
treec1c87b0abd0ad433506e2736a97ad92caa6901ca /spec/unit/provider
parentf9e44f041b3fdc120b1c78554c35c83f7517152e (diff)
downloadpuppet-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/unit/provider')
-rwxr-xr-x[-rw-r--r--]spec/unit/provider/cisco_spec.rb7
-rwxr-xr-xspec/unit/provider/interface/cisco_spec.rb3
-rwxr-xr-xspec/unit/provider/network_device_spec.rb3
-rwxr-xr-xspec/unit/provider/package/pkgutil_spec.rb5
-rwxr-xr-xspec/unit/provider/vlan/cisco_spec.rb3
5 files changed, 8 insertions, 13 deletions
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'