Tests should be using require_relative
The #require_relative statement is relative to the file containing the the statement. Also, updated spec_helper constants to follow existing spacing format. Change-Id: I6f927ec31bb1092cbc65e99855febaeec7b59ae5
This commit is contained in:
18
Gemfile.lock
18
Gemfile.lock
@@ -8,7 +8,7 @@ GEM
|
|||||||
akami (1.2.0)
|
akami (1.2.0)
|
||||||
gyoku (>= 0.4.0)
|
gyoku (>= 0.4.0)
|
||||||
nokogiri (>= 1.4.0)
|
nokogiri (>= 1.4.0)
|
||||||
berkshelf (1.4.4)
|
berkshelf (1.4.5)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 3.2.0)
|
||||||
addressable
|
addressable
|
||||||
celluloid (>= 0.14.0)
|
celluloid (>= 0.14.0)
|
||||||
@@ -21,13 +21,13 @@ GEM
|
|||||||
mixlib-shellout (~> 1.1)
|
mixlib-shellout (~> 1.1)
|
||||||
multi_json (~> 1.5)
|
multi_json (~> 1.5)
|
||||||
retryable
|
retryable
|
||||||
ridley (~> 0.12.1)
|
ridley (~> 0.12.4)
|
||||||
solve (>= 0.4.2)
|
solve (>= 0.4.2)
|
||||||
thor (~> 0.18.0)
|
thor (~> 0.18.0)
|
||||||
yajl-ruby
|
yajl-ruby
|
||||||
builder (3.2.0)
|
builder (3.2.2)
|
||||||
bunny (0.7.9)
|
bunny (0.7.9)
|
||||||
celluloid (0.14.0)
|
celluloid (0.14.1)
|
||||||
timers (>= 1.0.0)
|
timers (>= 1.0.0)
|
||||||
chef (10.18.2)
|
chef (10.18.2)
|
||||||
bunny (>= 0.6.0, < 0.8.0)
|
bunny (>= 0.6.0, < 0.8.0)
|
||||||
@@ -63,7 +63,7 @@ GEM
|
|||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
faraday (0.8.7)
|
faraday (0.8.7)
|
||||||
multipart-post (~> 1.1)
|
multipart-post (~> 1.1)
|
||||||
fauxhai (1.1.0)
|
fauxhai (1.1.1)
|
||||||
httparty
|
httparty
|
||||||
net-ssh
|
net-ssh
|
||||||
ohai
|
ohai
|
||||||
@@ -109,7 +109,7 @@ GEM
|
|||||||
mixlib-log (1.6.0)
|
mixlib-log (1.6.0)
|
||||||
mixlib-shellout (1.1.0)
|
mixlib-shellout (1.1.0)
|
||||||
moneta (0.6.0)
|
moneta (0.6.0)
|
||||||
multi_json (1.7.3)
|
multi_json (1.7.5)
|
||||||
multi_xml (0.5.3)
|
multi_xml (0.5.3)
|
||||||
multipart-post (1.2.0)
|
multipart-post (1.2.0)
|
||||||
net-http-persistent (2.8)
|
net-http-persistent (2.8)
|
||||||
@@ -135,19 +135,17 @@ GEM
|
|||||||
rest-client (1.6.7)
|
rest-client (1.6.7)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
retryable (1.3.3)
|
retryable (1.3.3)
|
||||||
ridley (0.12.2)
|
ridley (0.12.4)
|
||||||
activesupport (>= 3.2.0)
|
|
||||||
addressable
|
addressable
|
||||||
celluloid (~> 0.14.0)
|
celluloid (~> 0.14.0)
|
||||||
chozo (>= 0.6.0)
|
chozo (>= 0.6.0)
|
||||||
erubis
|
erubis
|
||||||
faraday (>= 0.8.4)
|
faraday (>= 0.8.4)
|
||||||
json (>= 1.5.0)
|
hashie (>= 2.0.2)
|
||||||
mixlib-authentication (>= 1.3.0)
|
mixlib-authentication (>= 1.3.0)
|
||||||
mixlib-config (>= 1.1.0)
|
mixlib-config (>= 1.1.0)
|
||||||
mixlib-log (>= 1.3.0)
|
mixlib-log (>= 1.3.0)
|
||||||
mixlib-shellout (>= 1.1.0)
|
mixlib-shellout (>= 1.1.0)
|
||||||
multi_json (>= 1.0.4)
|
|
||||||
net-http-persistent (>= 2.8)
|
net-http-persistent (>= 2.8)
|
||||||
net-ssh
|
net-ssh
|
||||||
retryable
|
retryable
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
require "spec_helper"
|
require_relative "spec_helper"
|
||||||
|
|
||||||
describe "openstack-identity::db" do
|
describe "openstack-identity::db" do
|
||||||
it "installs mysql packages" do
|
it "installs mysql packages" do
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
require "spec_helper"
|
require_relative "spec_helper"
|
||||||
|
|
||||||
describe "openstack-identity::default" do
|
describe "openstack-identity::default" do
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
require_relative "spec_helper"
|
||||||
|
|
||||||
describe Chef::Provider::Execute do
|
describe Chef::Provider::Execute do
|
||||||
before do
|
before do
|
||||||
@node = Chef::Node.new
|
@node = Chef::Node.new
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
require "spec_helper"
|
require_relative "spec_helper"
|
||||||
|
|
||||||
describe "openstack-identity::server" do
|
describe "openstack-identity::server" do
|
||||||
describe "suse" do
|
describe "suse" do
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
require "spec_helper"
|
require_relative "spec_helper"
|
||||||
|
|
||||||
describe "openstack-identity::server" do
|
describe "openstack-identity::server" do
|
||||||
describe "redhat" do
|
describe "redhat" do
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
require "spec_helper"
|
require_relative "spec_helper"
|
||||||
|
|
||||||
describe "openstack-identity::server" do
|
describe "openstack-identity::server" do
|
||||||
describe "ubuntu" do
|
describe "ubuntu" do
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ require "chefspec"
|
|||||||
|
|
||||||
::LOG_LEVEL = :fatal
|
::LOG_LEVEL = :fatal
|
||||||
::OPENSUSE_OPTS = {
|
::OPENSUSE_OPTS = {
|
||||||
:platform => "opensuse",
|
:platform => "opensuse",
|
||||||
:version => "12.3",
|
:version => "12.3",
|
||||||
:log_level => ::LOG_LEVEL
|
:log_level => ::LOG_LEVEL
|
||||||
}
|
}
|
||||||
::REDHAT_OPTS = {
|
::REDHAT_OPTS = {
|
||||||
:platform => "redhat",
|
:platform => "redhat",
|
||||||
:version => "6.3",
|
:version => "6.3",
|
||||||
:log_level => ::LOG_LEVEL
|
:log_level => ::LOG_LEVEL
|
||||||
}
|
}
|
||||||
::UBUNTU_OPTS = {
|
::UBUNTU_OPTS = {
|
||||||
|
|||||||
Reference in New Issue
Block a user