Merge pull request #36 from atheiman/tags-not-nil

spec for unspecified tags
atheiman · Nov 26, 2017 · 00c75e2 · 00c75e2
2 parents 65fbe7e + 48744c6
commit 00c75e2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 52 deletions.
diff --git a/spec/chef-fixtures/chef-objects.yml b/spec/chef-fixtures/chef-objects.yml
@@ -40,3 +40,11 @@ nodes:
       deep:
         nested:
           attribute: 0
+  'node-3':
+    chef_environment: '_default'
+    run_list:
+      - 'recipe[global_cookbook]'
+    default:
+      deep:
+        nested:
+          attribute: 0
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
@@ -24,6 +24,41 @@
     @server.start_background
   end
 
+  let(:main_nodes) do
+    {"bcr-node"=>
+      {"environment"=>"bcr_env",
+       "fqdn"=>nil,
+       "ip"=>nil,
+       "run_list"=>["recipe[global_cookbook]", "role[bcr_role]"],
+       "roles"=>nil,
+       "platform"=>nil,
+       "tags"=>["bcr-tag", "global-tag"]},
+     "node-1"=>
+      {"environment"=>"env_one",
+       "fqdn"=>nil,
+       "ip"=>nil,
+       "run_list"=>["recipe[global_cookbook]", "role[node_one_role]"],
+       "roles"=>nil,
+       "platform"=>nil,
+       "tags"=>["node-1-tag", "global-tag"]},
+     "node-2"=>
+      {"environment"=>"env_two",
+       "fqdn"=>nil,
+       "ip"=>nil,
+       "run_list"=>["recipe[global_cookbook]", "role[node_two_role]"],
+       "roles"=>nil,
+       "platform"=>nil,
+       "tags"=>["node-2-tag", "global-tag"]},
+     "node-3"=>
+      {"environment"=>"_default",
+       "fqdn"=>nil,
+       "ip"=>nil,
+       "run_list"=>["recipe[global_cookbook]"],
+       "roles"=>nil,
+       "platform"=>nil,
+       "tags"=>[]}}
+  end
+
   context 'with nodes loaded into chef server' do
     it '/ should respond ok' do
       get '/'
@@ -37,65 +72,15 @@
         expect(last_response).to be_ok
         expect(last_response.headers['Content-Type']).to match(/text\/yaml/)
         nodes = YAML.load(last_response.body)
-        expect(nodes).to eq(
-          {"bcr-node"=>
-            {"environment"=>"bcr_env",
-             "fqdn"=>nil,
-             "ip"=>nil,
-             "run_list"=>["recipe[global_cookbook]", "role[bcr_role]"],
-             "roles"=>nil,
-             "platform"=>nil,
-             "tags"=>["bcr-tag", "global-tag"]},
-           "node-1"=>
-            {"environment"=>"env_one",
-             "fqdn"=>nil,
-             "ip"=>nil,
-             "run_list"=>["recipe[global_cookbook]", "role[node_one_role]"],
-             "roles"=>nil,
-             "platform"=>nil,
-             "tags"=>["node-1-tag", "global-tag"]},
-           "node-2"=>
-            {"environment"=>"env_two",
-             "fqdn"=>nil,
-             "ip"=>nil,
-             "run_list"=>["recipe[global_cookbook]", "role[node_two_role]"],
-             "roles"=>nil,
-             "platform"=>nil,
-             "tags"=>["node-2-tag", "global-tag"]}}
-        )
+        expect(nodes).to eq(main_nodes)
       end
 
       it '/main/*:* should return the same result as /*:*' do
         get '/main/*:*'
         expect(last_response).to be_ok
         expect(last_response.headers['Content-Type']).to match(/text\/yaml/)
         nodes = YAML.load(last_response.body)
-        expect(nodes).to eq(
-          {"bcr-node"=>
-            {"environment"=>"bcr_env",
-             "fqdn"=>nil,
-             "ip"=>nil,
-             "run_list"=>["recipe[global_cookbook]", "role[bcr_role]"],
-             "roles"=>nil,
-             "platform"=>nil,
-             "tags"=>["bcr-tag", "global-tag"]},
-           "node-1"=>
-            {"environment"=>"env_one",
-             "fqdn"=>nil,
-             "ip"=>nil,
-             "run_list"=>["recipe[global_cookbook]", "role[node_one_role]"],
-             "roles"=>nil,
-             "platform"=>nil,
-             "tags"=>["node-1-tag", "global-tag"]},
-           "node-2"=>
-            {"environment"=>"env_two",
-             "fqdn"=>nil,
-             "ip"=>nil,
-             "run_list"=>["recipe[global_cookbook]", "role[node_two_role]"],
-             "roles"=>nil,
-             "platform"=>nil,
-             "tags"=>["node-2-tag", "global-tag"]}}
-        )
+        expect(nodes).to eq(main_nodes)
       end
 
       it 'filter result should be created based on GET params' do