Merge pull request #17 from chef/ashiqueps/rebranding_updates

Updated the error message and start message branding
chef · Nov 27, 2024 · 13b3fbf · 13b3fbf
2 parents 01683d6 + 02e30f6
commit 13b3fbf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/features/kitchen_test_command.feature b/features/kitchen_test_command.feature
@@ -25,11 +25,11 @@ Feature: Running a full test instance test
   @spawn
   Scenario: Running a single instance
     When I run `kitchen test client-beans`
-    Then the output should contain "Starting Test Kitchen"
+    Then the output should contain "Starting Chef Test Kitchen Enterprise"
     Then the output should contain "Cleaning up any prior instances of <client-beans>"
     Then the output should contain "Testing <client-beans>"
     Then the output should contain "Finished testing <client-beans>"
-    Then the output should contain "Test Kitchen is finished."
+    Then the output should contain "Chef Test Kitchen Enterprise is finished."
     And the exit status should be 0
 
   @spawn
@@ -74,12 +74,12 @@ Feature: Running a full test instance test
   @spawn
   Scenario: Running all instances
     When I run `kitchen test`
-    Then the output should contain "Starting Test Kitchen"
+    Then the output should contain "Starting Chef Test Kitchen Enterprise"
     Then the output should contain "Finished testing <client-cool>"
     Then the output should contain "Finished testing <client-beans>"
     Then the output should contain "Finished testing <server-cool>"
     Then the output should contain "Finished testing <server-beans>"
-    Then the output should contain "Test Kitchen is finished."
+    Then the output should contain "Chef Test Kitchen Enterprise is finished."
     And the exit status should be 0
     When I successfully run `kitchen list`
     Then the output should match /^client-cool\s+.+\s+\<Not Created\>\s+\<None\>$/

diff --git a/lib/kitchen/command/action.rb b/lib/kitchen/command/action.rb
@@ -29,12 +29,12 @@ class Action < Kitchen::Command::Base
 
       # Invoke the command.
       def call
-        banner "Starting Test Kitchen (v#{Kitchen::VERSION})"
+        banner "Starting Chef Test Kitchen Enterprise (v#{Kitchen::VERSION})"
         elapsed = Benchmark.measure do
           results = parse_subcommand(args.first)
           run_action(action, results)
         end
-        banner "Test Kitchen is finished. #{Util.duration(elapsed.real)}"
+        banner "Chef Test Kitchen Enterprise is finished. #{Util.duration(elapsed.real)}"
       end
     end
   end

diff --git a/lib/kitchen/command/test.rb b/lib/kitchen/command/test.rb
@@ -33,14 +33,14 @@ def call
           raise ArgumentError, "Destroy mode must be passing, always, or never."
         end
 
-        banner "Starting Test Kitchen (v#{Kitchen::VERSION})"
+        banner "Starting Chef Test Kitchen Enterprise (v#{Kitchen::VERSION})"
         elapsed = Benchmark.measure do
           destroy_mode = options[:destroy].to_sym
           results = parse_subcommand(args.join("|"))
 
           run_action(:test, results, destroy_mode)
         end
-        banner "Test Kitchen is finished. #{Util.duration(elapsed.real)}"
+        banner "Chef Test Kitchen Enterprise is finished. #{Util.duration(elapsed.real)}"
       end
     end
   end

diff --git a/lib/kitchen/licensing/base.rb b/lib/kitchen/licensing/base.rb
@@ -33,7 +33,7 @@ class Base
       class << self
         def get_license_keys
           keys = ChefLicensing.license_keys
-          raise ChefLicensing::InvalidLicense, "A valid license is required to perform this action." if keys.blank?
+          raise ChefLicensing::InvalidLicense, "A valid license is required to perform this action. Run <kitchen license> command to generate/activate the license." if keys.blank?
 
           client = get_license_client(keys)