cheffish 4.0.0 → 4.1.0

data/spec/integration/chef_organization_spec.rb

@@ -1,221 +1,221 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
+require "support/spec_support"
+require "cheffish/rspec/chef_run_support"
 
 describe Chef::Resource::ChefOrganization do
   extend Cheffish::RSpec::ChefRunSupport
 
-  when_the_chef_12_server 'is in multi-org mode' do
-    context 'and chef_server_url is pointed at the top level' do
-      user 'u', {}
-      user 'u2', {}
+  when_the_chef_12_server "is in multi-org mode" do
+    context "and chef_server_url is pointed at the top level" do
+      user "u", {}
+      user "u2", {}
 
       it 'chef_organization "x" creates the organization' do
-        expect_recipe {
-          chef_organization 'x'
-        }.to have_updated('chef_organization[x]', :create)
-        expect(get('/organizations/x')['full_name']).to eq('x')
+        expect_recipe do
+          chef_organization "x"
+        end.to have_updated("chef_organization[x]", :create)
+        expect(get("/organizations/x")["full_name"]).to eq("x")
       end
     end
 
-    context 'and chef_server_url is pointed at /organizations/foo' do
-      organization 'foo'
+    context "and chef_server_url is pointed at /organizations/foo" do
+      organization "foo"
 
       before :each do
-        Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo').to_s
+        Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, "/organizations/foo").to_s
       end
 
-      context 'and is empty' do
-        user 'u', {}
-        user 'u2', {}
+      context "and is empty" do
+        user "u", {}
+        user "u2", {}
 
         it 'chef_organization "x" creates the organization' do
-          expect_recipe {
-            chef_organization 'x'
-          }.to have_updated('chef_organization[x]', :create)
-          expect(get('/organizations/x')['full_name']).to eq('x')
+          expect_recipe do
+            chef_organization "x"
+          end.to have_updated("chef_organization[x]", :create)
+          expect(get("/organizations/x")["full_name"]).to eq("x")
         end
 
         it 'chef_organization "x" with full_name creates the organization' do
-          expect_recipe {
-            chef_organization 'x' do
-              full_name 'Hi'
+          expect_recipe do
+            chef_organization "x" do
+              full_name "Hi"
             end
-          }.to have_updated('chef_organization[x]', :create)
-          expect(get('/organizations/x')['full_name']).to eq('Hi')
+          end.to have_updated("chef_organization[x]", :create)
+          expect(get("/organizations/x")["full_name"]).to eq("Hi")
         end
 
         it 'chef_organization "x" and inviting users creates the invites' do
-          expect_recipe {
-            chef_organization 'x' do
-              invites 'u', 'u2'
+          expect_recipe do
+            chef_organization "x" do
+              invites "u", "u2"
             end
-          }.to have_updated('chef_organization[x]', :create)
-          expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(u u2))
+          end.to have_updated("chef_organization[x]", :create)
+          expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{u u2})
         end
 
         it 'chef_organization "x" adds members' do
-          expect_recipe {
-            chef_organization 'x' do
-              members 'u', 'u2'
+          expect_recipe do
+            chef_organization "x" do
+              members "u", "u2"
             end
-          }.to have_updated('chef_organization[x]', :create)
-          expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(u u2))
+          end.to have_updated("chef_organization[x]", :create)
+          expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{u u2})
         end
       end
 
-      context 'and already has an organization named x' do
-        user 'u', {}
-        user 'u2', {}
-        user 'u3', {}
-        user 'member', {}
-        user 'member2', {}
-        user 'invited', {}
-        user 'invited2', {}
-        organization 'x', { 'full_name' => 'Lo' } do
-          org_member 'member', 'member2'
-          org_invite 'invited', 'invited2'
+      context "and already has an organization named x" do
+        user "u", {}
+        user "u2", {}
+        user "u3", {}
+        user "member", {}
+        user "member2", {}
+        user "invited", {}
+        user "invited2", {}
+        organization "x", { "full_name" => "Lo" } do
+          org_member "member", "member2"
+          org_invite "invited", "invited2"
         end
 
         it 'chef_organization "x" changes nothing' do
-          expect_recipe {
-            chef_organization 'x'
-          }.not_to have_updated('chef_organization[x]', :create)
-          expect(get('/organizations/x')['full_name']).to eq('Lo')
+          expect_recipe do
+            chef_organization "x"
+          end.not_to have_updated("chef_organization[x]", :create)
+          expect(get("/organizations/x")["full_name"]).to eq("Lo")
         end
 
         it 'chef_organization "x" with "complete true" reverts the full_name' do
-          expect_recipe {
-            chef_organization 'x' do
+          expect_recipe do
+            chef_organization "x" do
               complete true
             end
-          }.to have_updated('chef_organization[x]', :create)
-          expect(get('/organizations/x')['full_name']).to eq('x')
+          end.to have_updated("chef_organization[x]", :create)
+          expect(get("/organizations/x")["full_name"]).to eq("x")
         end
 
         it 'chef_organization "x" with new full_name updates the organization' do
-          expect_recipe {
-            chef_organization 'x' do
-              full_name 'Hi'
+          expect_recipe do
+            chef_organization "x" do
+              full_name "Hi"
             end
-          }.to have_updated('chef_organization[x]', :create)
-          expect(get('/organizations/x')['full_name']).to eq('Hi')
+          end.to have_updated("chef_organization[x]", :create)
+          expect(get("/organizations/x")["full_name"]).to eq("Hi")
         end
 
-        context 'invites and membership tests' do
+        context "invites and membership tests" do
           it 'chef_organization "x" and inviting users creates the invites' do
-            expect_recipe {
-              chef_organization 'x' do
-                invites 'u', 'u2'
+            expect_recipe do
+              chef_organization "x" do
+                invites "u", "u2"
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited invited2 u u2))
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited invited2 u u2})
           end
 
           it 'chef_organization "x" adds members' do
-            expect_recipe {
-              chef_organization 'x' do
-                members 'u', 'u2'
+            expect_recipe do
+              chef_organization "x" do
+                members "u", "u2"
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member member2 u u2))
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member member2 u u2})
           end
 
           it 'chef_organization "x" does nothing when inviting already-invited users and members' do
-            expect_recipe {
-              chef_organization 'x' do
-                invites 'invited', 'member'
+            expect_recipe do
+              chef_organization "x" do
+                invites "invited", "member"
               end
-            }.not_to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited invited2))
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member member2))
+            end.not_to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited invited2})
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member member2})
           end
 
           it 'chef_organization "x" does nothing when adding members who are already members' do
-            expect_recipe {
-              chef_organization 'x' do
-                members 'member'
+            expect_recipe do
+              chef_organization "x" do
+                members "member"
               end
-            }.not_to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited invited2))
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member member2))
+            end.not_to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited invited2})
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member member2})
           end
 
           it 'chef_organization "x" upgrades invites to members when asked' do
-            expect_recipe {
-              chef_organization 'x' do
-                members 'invited'
+            expect_recipe do
+              chef_organization "x" do
+                members "invited"
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(invited member member2))
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited2))
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{invited member member2})
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited2})
           end
 
           it 'chef_organization "x" removes members and invites when asked' do
-            expect_recipe {
-              chef_organization 'x' do
-                remove_members 'invited', 'member'
+            expect_recipe do
+              chef_organization "x" do
+                remove_members "invited", "member"
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited2))
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member2))
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited2})
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member2})
           end
 
           it 'chef_organization "x" does nothing when asked to remove non-members' do
-            expect_recipe {
-              chef_organization 'x' do
-                remove_members 'u', 'u2'
+            expect_recipe do
+              chef_organization "x" do
+                remove_members "u", "u2"
               end
-            }.not_to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited invited2))
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member member2))
+            end.not_to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited invited2})
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member member2})
           end
 
           it 'chef_organization "x" with "complete true" reverts the full_name but does not remove invites or members' do
-            expect_recipe {
-              chef_organization 'x' do
+            expect_recipe do
+              chef_organization "x" do
                 complete true
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x')['full_name']).to eq('x')
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited invited2))
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member member2))
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x")["full_name"]).to eq("x")
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited invited2})
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member member2})
           end
 
           it 'chef_organization "x" with members [] and "complete true" removes invites and members' do
-            expect_recipe {
-              chef_organization 'x' do
+            expect_recipe do
+              chef_organization "x" do
                 members []
                 complete true
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x')['full_name']).to eq('x')
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq([])
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq([])
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x")["full_name"]).to eq("x")
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq([])
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq([])
           end
 
           it 'chef_organization "x" with invites [] and "complete true" removes invites but not members' do
-            expect_recipe {
-              chef_organization 'x' do
+            expect_recipe do
+              chef_organization "x" do
                 invites []
                 complete true
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x')['full_name']).to eq('x')
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq([])
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member member2))
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x")["full_name"]).to eq("x")
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq([])
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member member2})
           end
 
           it 'chef_organization "x" with invites, members and "complete true" removes all non-specified invites and members' do
-            expect_recipe {
-              chef_organization 'x' do
-                invites 'invited', 'u'
-                members 'member', 'u2'
+            expect_recipe do
+              chef_organization "x" do
+                invites "invited", "u"
+                members "member", "u2"
                 complete true
               end
-            }.to have_updated('chef_organization[x]', :create)
-            expect(get('/organizations/x')['full_name']).to eq('x')
-            expect(get('/organizations/x/association_requests').map { |u| u['username'] }).to eq(%w(invited u))
-            expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq(%w(member u2))
+            end.to have_updated("chef_organization[x]", :create)
+            expect(get("/organizations/x")["full_name"]).to eq("x")
+            expect(get("/organizations/x/association_requests").map { |u| u["username"] }).to eq(%w{invited u})
+            expect(get("/organizations/x/users").map { |u| u["user"]["username"] }).to eq(%w{member u2})
           end
         end
       end

data/spec/integration/chef_role_spec.rb

@@ -1,29 +1,29 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
+require "support/spec_support"
+require "cheffish/rspec/chef_run_support"
 
 describe Chef::Resource::ChefRole do
   extend Cheffish::RSpec::ChefRunSupport
 
-  when_the_chef_12_server 'is in multi-org mode' do
-    organization 'foo'
+  when_the_chef_12_server "is in multi-org mode" do
+    organization "foo"
 
     before :each do
-      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo').to_s
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, "/organizations/foo").to_s
     end
 
-    context 'and is empty' do
+    context "and is empty" do
       context 'and we run a recipe that creates role "blah"' do
-        it 'the role gets created' do
-          expect_recipe {
-            chef_role 'blah'
-          }.to have_updated 'chef_role[blah]', :create
-          expect(get('roles/blah')['name']).to eq('blah')
+        it "the role gets created" do
+          expect_recipe do
+            chef_role "blah"
+          end.to have_updated "chef_role[blah]", :create
+          expect(get("roles/blah")["name"]).to eq("blah")
         end
       end
 
       # TODO why-run mode
 
-      context 'and another chef server is running on port 8899' do
+      context "and another chef server is running on port 8899" do
         before :each do
           @server = ChefZero::Server.new(:port => 8899)
           @server.start_background
@@ -35,40 +35,40 @@ describe Chef::Resource::ChefRole do
 
         context 'and a recipe is run that creates role "blah" on the second chef server using with_chef_server' do
 
-          it 'the role is created on the second chef server but not the first' do
-            expect_recipe {
-              with_chef_server 'http://127.0.0.1:8899'
-              chef_role 'blah'
-            }.to have_updated 'chef_role[blah]', :create
-            expect { get('roles/blah') }.to raise_error(Net::HTTPServerException)
-            expect(get('http://127.0.0.1:8899/roles/blah')['name']).to eq('blah')
+          it "the role is created on the second chef server but not the first" do
+            expect_recipe do
+              with_chef_server "http://127.0.0.1:8899"
+              chef_role "blah"
+            end.to have_updated "chef_role[blah]", :create
+            expect { get("roles/blah") }.to raise_error(Net::HTTPServerException)
+            expect(get("http://127.0.0.1:8899/roles/blah")["name"]).to eq("blah")
           end
         end
 
         context 'and a recipe is run that creates role "blah" on the second chef server using chef_server' do
 
-          it 'the role is created on the second chef server but not the first' do
-            expect_recipe {
-              chef_role 'blah' do
-                chef_server({ :chef_server_url => 'http://127.0.0.1:8899' })
+          it "the role is created on the second chef server but not the first" do
+            expect_recipe do
+              chef_role "blah" do
+                chef_server({ :chef_server_url => "http://127.0.0.1:8899" })
               end
-            }.to have_updated 'chef_role[blah]', :create
-            expect { get('roles/blah') }.to raise_error(Net::HTTPServerException)
-            expect(get('http://127.0.0.1:8899/roles/blah')['name']).to eq('blah')
+            end.to have_updated "chef_role[blah]", :create
+            expect { get("roles/blah") }.to raise_error(Net::HTTPServerException)
+            expect(get("http://127.0.0.1:8899/roles/blah")["name"]).to eq("blah")
           end
         end
       end
     end
   end
 
-  when_the_chef_server 'is in OSC mode' do
-    context 'and is empty' do
+  when_the_chef_server "is in OSC mode" do
+    context "and is empty" do
       context 'and we run a recipe that creates role "blah"' do
-        it 'the role gets created' do
-          expect_recipe {
-            chef_role 'blah'
-          }.to have_updated 'chef_role[blah]', :create
-          expect(get('roles/blah')['name']).to eq('blah')
+        it "the role gets created" do
+          expect_recipe do
+            chef_role "blah"
+          end.to have_updated "chef_role[blah]", :create
+          expect(get("roles/blah")["name"]).to eq("blah")
         end
       end
     end

data/spec/integration/chef_user_spec.rb

@@ -1,8 +1,8 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
-require 'support/key_support'
+require "support/spec_support"
+require "cheffish/rspec/chef_run_support"
+require "support/key_support"
 
-repo_path = Dir.mktmpdir('chef_repo')
+repo_path = Dir.mktmpdir("chef_repo")
 
 describe Chef::Resource::ChefUser do
   extend Cheffish::RSpec::ChefRunSupport
@@ -11,70 +11,70 @@ describe Chef::Resource::ChefUser do
     private_key "#{repo_path}/blah.pem"
   end
 
-  when_the_chef_server 'is empty' do
-    context 'and we run a recipe that creates user "blah"'do
-      it 'the user gets created' do
-        expect_recipe {
-          chef_user 'blah' do
+  when_the_chef_server "is empty" do
+    context 'and we run a recipe that creates user "blah"' do
+      it "the user gets created" do
+        expect_recipe do
+          chef_user "blah" do
             source_key_path "#{repo_path}/blah.pem"
           end
-        }.to have_updated 'chef_user[blah]', :create
-        user = get('/users/blah')
-        expect(user['name']).to eq('blah')
-        key, format = Cheffish::KeyFormatter.decode(user['public_key'])
+        end.to have_updated "chef_user[blah]", :create
+        user = get("/users/blah")
+        expect(user["name"]).to eq("blah")
+        key, format = Cheffish::KeyFormatter.decode(user["public_key"])
         expect(key).to be_public_key_for("#{repo_path}/blah.pem")
       end
     end
 
     context 'and we run a recipe that creates user "blah" with output_key_path' do
       with_converge do
-        chef_user 'blah' do
+        chef_user "blah" do
           source_key_path "#{repo_path}/blah.pem"
           output_key_path "#{repo_path}/blah.pub"
         end
       end
 
-      it 'the output public key gets created' do
-        expect(IO.read("#{repo_path}/blah.pub")).to start_with('ssh-rsa ')
+      it "the output public key gets created" do
+        expect(IO.read("#{repo_path}/blah.pub")).to start_with("ssh-rsa ")
         expect("#{repo_path}/blah.pub").to be_public_key_for("#{repo_path}/blah.pem")
       end
     end
   end
 
-  when_the_chef_12_server 'is in multi-org mode' do
-    context 'and chef_server_url is pointed at the top level' do
-      context 'and we run a recipe that creates user "blah"'do
-        it 'the user gets created' do
-          expect_recipe {
-            chef_user 'blah' do
+  when_the_chef_12_server "is in multi-org mode" do
+    context "and chef_server_url is pointed at the top level" do
+      context 'and we run a recipe that creates user "blah"' do
+        it "the user gets created" do
+          expect_recipe do
+            chef_user "blah" do
               source_key_path "#{repo_path}/blah.pem"
             end
-          }.to have_updated 'chef_user[blah]', :create
-          user = get('/users/blah')
-          expect(user['name']).to eq('blah')
-          key, format = Cheffish::KeyFormatter.decode(user['public_key'])
+          end.to have_updated "chef_user[blah]", :create
+          user = get("/users/blah")
+          expect(user["name"]).to eq("blah")
+          key, format = Cheffish::KeyFormatter.decode(user["public_key"])
           expect(key).to be_public_key_for("#{repo_path}/blah.pem")
         end
       end
     end
 
-    context 'and chef_server_url is pointed at /organizations/foo' do
-      organization 'foo'
+    context "and chef_server_url is pointed at /organizations/foo" do
+      organization "foo"
 
       before :each do
-        Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo').to_s
+        Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, "/organizations/foo").to_s
       end
 
-      context 'and we run a recipe that creates user "blah"'do
-        it 'the user gets created' do
-          expect_recipe {
-            chef_user 'blah' do
+      context 'and we run a recipe that creates user "blah"' do
+        it "the user gets created" do
+          expect_recipe do
+            chef_user "blah" do
               source_key_path "#{repo_path}/blah.pem"
             end
-          }.to have_updated 'chef_user[blah]', :create
-          user = get('/users/blah')
-          expect(user['name']).to eq('blah')
-          key, format = Cheffish::KeyFormatter.decode(user['public_key'])
+          end.to have_updated "chef_user[blah]", :create
+          user = get("/users/blah")
+          expect(user["name"]).to eq("blah")
+          key, format = Cheffish::KeyFormatter.decode(user["public_key"])
           expect(key).to be_public_key_for("#{repo_path}/blah.pem")
         end
       end