summaryrefslogtreecommitdiff
path: root/spec/data
diff options
context:
space:
mode:
authorNoah Kantrowitz <noah@coderanger.net>2017-04-05 12:17:03 -0700
committerGitHub <noreply@github.com>2017-04-05 12:17:03 -0700
commit02af213176224af8e64d859877b2cbfd548e4918 (patch)
tree6d194bd2331aedb18b08343faedce598bc480efe /spec/data
parent674798d34e1e8e9b23c73d4015de21da81419021 (diff)
parent98583c917ce1689d2c6aa36fcf19c9dab90662e3 (diff)
downloadchef-02af213176224af8e64d859877b2cbfd548e4918.tar.gz
Merge pull request #6023 from coderanger/root-alias
Improve coverage of root alias tests
Diffstat (limited to 'spec/data')
-rw-r--r--spec/data/root_alias_cookbooks/dup_attr/attributes.rb (renamed from spec/data/cookbooks/aliased/attributes.rb)0
-rw-r--r--spec/data/root_alias_cookbooks/dup_attr/attributes/default.rb1
-rw-r--r--spec/data/root_alias_cookbooks/dup_attr/metadata.rb2
-rw-r--r--spec/data/root_alias_cookbooks/dup_attr/recipe.rb (renamed from spec/data/cookbooks/aliased/recipe.rb)0
-rw-r--r--spec/data/root_alias_cookbooks/dup_recipe/attributes.rb1
-rw-r--r--spec/data/root_alias_cookbooks/dup_recipe/metadata.rb2
-rw-r--r--spec/data/root_alias_cookbooks/dup_recipe/recipe.rb3
-rw-r--r--spec/data/root_alias_cookbooks/dup_recipe/recipes/default.rb3
-rw-r--r--spec/data/root_alias_cookbooks/simple/attributes.rb1
-rw-r--r--spec/data/root_alias_cookbooks/simple/metadata.rb (renamed from spec/data/cookbooks/aliased/metadata.rb)2
-rw-r--r--spec/data/root_alias_cookbooks/simple/recipe.rb3
11 files changed, 17 insertions, 1 deletions
diff --git a/spec/data/cookbooks/aliased/attributes.rb b/spec/data/root_alias_cookbooks/dup_attr/attributes.rb
index 3a3bab96e1..3a3bab96e1 100644
--- a/spec/data/cookbooks/aliased/attributes.rb
+++ b/spec/data/root_alias_cookbooks/dup_attr/attributes.rb
diff --git a/spec/data/root_alias_cookbooks/dup_attr/attributes/default.rb b/spec/data/root_alias_cookbooks/dup_attr/attributes/default.rb
new file mode 100644
index 0000000000..a6f6c78bb0
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/dup_attr/attributes/default.rb
@@ -0,0 +1 @@
+default["aliased"]["attr"] = "other"
diff --git a/spec/data/root_alias_cookbooks/dup_attr/metadata.rb b/spec/data/root_alias_cookbooks/dup_attr/metadata.rb
new file mode 100644
index 0000000000..703a73ab19
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/dup_attr/metadata.rb
@@ -0,0 +1,2 @@
+name "dup_attr"
+version "1.0.0"
diff --git a/spec/data/cookbooks/aliased/recipe.rb b/spec/data/root_alias_cookbooks/dup_attr/recipe.rb
index d82e58fbcd..d82e58fbcd 100644
--- a/spec/data/cookbooks/aliased/recipe.rb
+++ b/spec/data/root_alias_cookbooks/dup_attr/recipe.rb
diff --git a/spec/data/root_alias_cookbooks/dup_recipe/attributes.rb b/spec/data/root_alias_cookbooks/dup_recipe/attributes.rb
new file mode 100644
index 0000000000..3a3bab96e1
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/dup_recipe/attributes.rb
@@ -0,0 +1 @@
+default["aliased"]["attr"] = "value"
diff --git a/spec/data/root_alias_cookbooks/dup_recipe/metadata.rb b/spec/data/root_alias_cookbooks/dup_recipe/metadata.rb
new file mode 100644
index 0000000000..62273a64d5
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/dup_recipe/metadata.rb
@@ -0,0 +1,2 @@
+name "dup_recipe"
+version "1.0.0"
diff --git a/spec/data/root_alias_cookbooks/dup_recipe/recipe.rb b/spec/data/root_alias_cookbooks/dup_recipe/recipe.rb
new file mode 100644
index 0000000000..d82e58fbcd
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/dup_recipe/recipe.rb
@@ -0,0 +1,3 @@
+ruby_block "root alias" do
+ block { }
+end
diff --git a/spec/data/root_alias_cookbooks/dup_recipe/recipes/default.rb b/spec/data/root_alias_cookbooks/dup_recipe/recipes/default.rb
new file mode 100644
index 0000000000..3eb7c22809
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/dup_recipe/recipes/default.rb
@@ -0,0 +1,3 @@
+ruby_block "other" do
+ block { }
+end
diff --git a/spec/data/root_alias_cookbooks/simple/attributes.rb b/spec/data/root_alias_cookbooks/simple/attributes.rb
new file mode 100644
index 0000000000..3a3bab96e1
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/simple/attributes.rb
@@ -0,0 +1 @@
+default["aliased"]["attr"] = "value"
diff --git a/spec/data/cookbooks/aliased/metadata.rb b/spec/data/root_alias_cookbooks/simple/metadata.rb
index e3b2b96177..9147558459 100644
--- a/spec/data/cookbooks/aliased/metadata.rb
+++ b/spec/data/root_alias_cookbooks/simple/metadata.rb
@@ -1,2 +1,2 @@
-name "aliased"
+name "simple"
version "1.0.0"
diff --git a/spec/data/root_alias_cookbooks/simple/recipe.rb b/spec/data/root_alias_cookbooks/simple/recipe.rb
new file mode 100644
index 0000000000..d82e58fbcd
--- /dev/null
+++ b/spec/data/root_alias_cookbooks/simple/recipe.rb
@@ -0,0 +1,3 @@
+ruby_block "root alias" do
+ block { }
+end