Merge pull request #429 from serverspec/move-rspec-its

Move requirement for rspec/its from setup.rb to serverspec.rb
mizzy · Jun 11, 2014 · 29523c0 · 29523c0
2 parents 34a1c79 + 9c3e626
commit 29523c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/lib/serverspec.rb b/lib/serverspec.rb
@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rspec'
+require 'rspec/its'
 require 'specinfra'
 require 'serverspec/version'
 require 'serverspec/matchers'

diff --git a/lib/serverspec/setup.rb b/lib/serverspec/setup.rb
@@ -215,7 +215,6 @@ def self.auto_vagrant_configuration
     def self.spec_helper_template
       template = <<-EOF
 require 'serverspec'
-require 'rspec/its'
 <% if @os_type == 'UN*X' && @backend_type == 'Ssh' -%>
 require 'pathname'
 <% end -%>