summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorAJ Christensen <aj@junglistheavy.industries>2014-12-30 11:39:55 +1300
committerBryan McLellan <btm@opscode.com>2015-02-09 21:58:39 -0500
commit95be9a0418b8db7b224092ef3e15282b5ae97eee (patch)
tree02c5ef4fa4fac28adf1a0abe5033e7b2642b3274 /spec/spec_helper.rb
parent955bce9ed05d6c69a37c506dc9e24a6e407e1a4d (diff)
downloadchef-95be9a0418b8db7b224092ef3e15282b5ae97eee.tar.gz
Refs #2709: Isolate/fix the no-fork fault
* Share specific recipes code to application parent * Update specs to passing, update specs to RSpec 3. * Specs for set_specific_recipes, solo, client.
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ad1f3f5d0d..8888efc424 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -83,8 +83,13 @@ Dir["spec/support/**/*.rb"].
OHAI_SYSTEM = Ohai::System.new
OHAI_SYSTEM.all_plugins("platform")
-TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
-TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
+
+TEST_PLATFORM =
+ (OHAI_SYSTEM['platform'] ||
+ 'unknown_test_platform').dup.freeze
+TEST_PLATFORM_VERSION =
+ (OHAI_SYSTEM['platform_version'] ||
+ 'unknown_platform_version').dup.freeze
RSpec.configure do |config|
config.include(Matchers)