summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-11-05 13:35:21 -0800
committertyler-ball <tyleraball@gmail.com>2014-12-17 18:47:26 -0800
commitb9b4d3bfd6ec6196cb78094e589c094edb61b501 (patch)
treeaf37e0f4d1bc3d2b621eff0e43758029afbe0fde
parent5647ffbafcf22cd54b1edc0b02926aca90b9099c (diff)
downloadchef-b9b4d3bfd6ec6196cb78094e589c094edb61b501.tar.gz
add rspec/its
-rw-r--r--chef.gemspec13
-rw-r--r--lib/chef/audit.rb1
-rw-r--r--lib/chef/audit/chef_example_group.rb1
-rw-r--r--lib/chef/dsl/audit.rb2
4 files changed, 7 insertions, 10 deletions
diff --git a/chef.gemspec b/chef.gemspec
index 2138f36114..eb7528e630 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -35,19 +35,16 @@ Gem::Specification.new do |s|
s.add_dependency 'plist', '~> 3.1.0'
+ %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_dependency gem, "~> 3.1" }
+ s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
+ s.add_dependency "serverspec", "~> 2.3"
+ s.add_dependency "specinfra", "~> 2.4"
+
s.add_development_dependency "rack"
# Rake 10.2 drops Ruby 1.8 support
s.add_development_dependency "rake", "~> 10.1.0"
- # rspec_junit_formatter 0.2.0 drops ruby 1.8.7 support
- s.add_development_dependency "rspec_junit_formatter", "~> 0.2.0"
-
- %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 3.1" }
-
- s.add_development_dependency "serverspec", "~> 2.3"
- s.add_development_dependency "specinfra", "~> 2.4"
-
s.bindir = "bin"
s.executables = %w( chef-client chef-solo knife chef-shell chef-apply )
diff --git a/lib/chef/audit.rb b/lib/chef/audit.rb
index 0c79928974..9d0a2a70ed 100644
--- a/lib/chef/audit.rb
+++ b/lib/chef/audit.rb
@@ -17,6 +17,7 @@
#
require 'rspec'
+require 'rspec/its'
require 'serverspec/matcher'
require 'serverspec/helper'
diff --git a/lib/chef/audit/chef_example_group.rb b/lib/chef/audit/chef_example_group.rb
index cd874d57b7..482647cd03 100644
--- a/lib/chef/audit/chef_example_group.rb
+++ b/lib/chef/audit/chef_example_group.rb
@@ -1,4 +1,3 @@
-require 'rspec/core'
class Chef
class Audit
diff --git a/lib/chef/dsl/audit.rb b/lib/chef/dsl/audit.rb
index a417e51b5d..75a57c6bb4 100644
--- a/lib/chef/dsl/audit.rb
+++ b/lib/chef/dsl/audit.rb
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-#require 'chef/audit'
+
require 'chef/audit/chef_example_group'
class Chef