diff --git a/Guardfile b/Guardfile index 2a31deb..8b24d60 100644 --- a/Guardfile +++ b/Guardfile @@ -16,7 +16,7 @@ group :rspec do watch(%r{^Gemfile$}) { all_specs } watch(%r{^Gemfile.lock$}) { all_specs } watch(%r{^spec/spec_helper\.rb$}) { all_specs } - watch(%r{^spec/helpers/(.+)\.rb$}) { all_specs } + watch(%r{^spec/fixtures/(.+)\.rb$}) { all_specs } watch(%r{^libraries/pacemaker\.rb$}) { all_specs } watch(%r{^spec/.+_spec\.rb$}) watch(%r{^libraries/(.+)\.rb$}) { |m| diff --git a/spec/helpers/clone_resource.rb b/spec/fixtures/clone_resource.rb similarity index 100% rename from spec/helpers/clone_resource.rb rename to spec/fixtures/clone_resource.rb diff --git a/spec/helpers/keystone_primitive.rb b/spec/fixtures/keystone_primitive.rb similarity index 100% rename from spec/helpers/keystone_primitive.rb rename to spec/fixtures/keystone_primitive.rb diff --git a/spec/libraries/pacemaker/cib_object_spec.rb b/spec/libraries/pacemaker/cib_object_spec.rb index e92ecb7..95bbbd8 100644 --- a/spec/libraries/pacemaker/cib_object_spec.rb +++ b/spec/libraries/pacemaker/cib_object_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' require 'mixlib/shellout' require_relative File.join(%w(.. .. .. libraries pacemaker)) -require_relative File.join(%w(.. .. helpers keystone_primitive)) +require_relative File.join(%w(.. .. fixtures keystone_primitive)) describe Pacemaker::CIBObject do diff --git a/spec/libraries/pacemaker/resource/primitive_spec.rb b/spec/libraries/pacemaker/resource/primitive_spec.rb index 4d8a198..4913f3d 100644 --- a/spec/libraries/pacemaker/resource/primitive_spec.rb +++ b/spec/libraries/pacemaker/resource/primitive_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' require_relative File.join(%w(.. .. .. .. libraries pacemaker resource primitive)) -require_relative File.join(%w(.. .. .. helpers keystone_primitive)) +require_relative File.join(%w(.. .. .. fixtures keystone_primitive)) describe Pacemaker::Resource::Primitive do before(:each) do diff --git a/spec/providers/primitive_spec.rb b/spec/providers/primitive_spec.rb index db944e8..b6e3227 100644 --- a/spec/providers/primitive_spec.rb +++ b/spec/providers/primitive_spec.rb @@ -1,6 +1,6 @@ require 'chef/application' require_relative File.join(%w(.. spec_helper)) -require_relative File.join(%w(.. helpers keystone_primitive)) +require_relative File.join(%w(.. fixtures keystone_primitive)) describe "Chef::Provider::PacemakerPrimitive" do # for use inside examples: