Use new have_test_dsc_configuration_return_success serverspec type (#252

) Serverspec change: `have_applied_dsc_configuration_successfully` -> `have_test_dsc_configuration_return_true` new test `have_dsc_configuration_status_of_success`
OctopusDeploy · Apr 13, 2020 · a64d600 · a64d600
1 parent 95acd6f
commit a64d600
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 28 deletions.
diff --git a/Tests/Gemfile b/Tests/Gemfile
@@ -4,4 +4,4 @@ gem "rake"
 gem "serverspec"
 gem "rspec-teamcity", "~> 0.0.1"
 gem "nokogiri"
-gem "octopus-serverspec-extensions", "~> 0.17.2"
+gem "octopus-serverspec-extensions", "~> 0.18.1"
diff --git a/Tests/Gemfile.lock b/Tests/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     nokogiri (1.10.8-x64-mingw32)
       mini_portile2 (~> 2.4.0)
-    octopus-serverspec-extensions (0.17.2)
+    octopus-serverspec-extensions (0.18.1)
       json (~> 2.1.0)
       rspec (~> 3.0)
       serverspec (~> 2)

diff --git a/Tests/Spec/server_scenario_01_install_spec.rb b/Tests/Spec/server_scenario_01_install_spec.rb
@@ -74,5 +74,6 @@
 #dsc overall status
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/server_scenario_02_install_second_node_spec.rb b/Tests/Spec/server_scenario_02_install_second_node_spec.rb
@@ -77,5 +77,6 @@
 #dsc overall status
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/server_scenario_03_remove_spec.rb b/Tests/Spec/server_scenario_03_remove_spec.rb
@@ -15,7 +15,8 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
 
 #todo: add a new type/matcher to the `octopus-serverspec-extensions` project

diff --git a/Tests/Spec/server_scenario_04_remove_second_node_spec.rb b/Tests/Spec/server_scenario_04_remove_second_node_spec.rb
@@ -15,7 +15,8 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
 
 #todo: add a new type/matcher to the `octopus-serverspec-extensions` project

diff --git a/Tests/Spec/server_scenario_05_install_custom_instance_spec.rb b/Tests/Spec/server_scenario_05_install_custom_instance_spec.rb
@@ -37,5 +37,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/server_scenario_06_remove_custom_instance_spec.rb b/Tests/Spec/server_scenario_06_remove_custom_instance_spec.rb
@@ -15,7 +15,8 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
 
 #todo: add a new type/matcher to the `octopus-serverspec-extensions` project

diff --git a/Tests/Spec/server_scenario_07_reinstall_spec.rb b/Tests/Spec/server_scenario_07_reinstall_spec.rb
@@ -42,6 +42,6 @@
 #dsc overall status
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
-
diff --git a/Tests/Spec/server_scenario_08_upgrade_spec.rb b/Tests/Spec/server_scenario_08_upgrade_spec.rb
@@ -45,6 +45,6 @@
 #dsc overall status
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
-
diff --git a/Tests/Spec/server_scenario_09_watchdog_create_spec.rb b/Tests/Spec/server_scenario_09_watchdog_create_spec.rb
@@ -7,5 +7,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/server_scenario_10_watchdog_delete_spec.rb b/Tests/Spec/server_scenario_10_watchdog_delete_spec.rb
@@ -7,5 +7,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/server_scenario_11_remove_spec.rb b/Tests/Spec/server_scenario_11_remove_spec.rb
@@ -15,7 +15,8 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
 
 #todo: add a new type/matcher to the `octopus-serverspec-extensions` project

diff --git a/Tests/Spec/server_scenario_12_built_in_worker_spec.rb b/Tests/Spec/server_scenario_12_built_in_worker_spec.rb
@@ -64,5 +64,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/server_scenario_13_remove_spec.rb b/Tests/Spec/server_scenario_13_remove_spec.rb
@@ -15,7 +15,8 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
 
 #todo: add a new type/matcher to the `octopus-serverspec-extensions` project

diff --git a/Tests/Spec/server_scenario_14_install_without_configure_spec.rb b/Tests/Spec/server_scenario_14_install_without_configure_spec.rb
@@ -28,5 +28,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/server_scenario_15_configure_preinstalled_instance_spec.rb b/Tests/Spec/server_scenario_15_configure_preinstalled_instance_spec.rb
@@ -49,5 +49,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/tentacle_scenario_01_install_spec.rb b/Tests/Spec/tentacle_scenario_01_install_spec.rb
@@ -239,8 +239,8 @@
   its(:content) { should match /Tentacle\.Communication\.TrustedOctopusServers.*#{config['OctopusServerThumbprint']}/}
 end
 
-### DSC success
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/tentacle_scenario_02_remove_spec.rb b/Tests/Spec/tentacle_scenario_02_remove_spec.rb
@@ -76,7 +76,8 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
 
 #todo: confirm whether these should be deleted

diff --git a/Tests/Spec/tentacle_scenario_03_reinstall_spec.rb b/Tests/Spec/tentacle_scenario_03_reinstall_spec.rb
@@ -49,5 +49,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/tentacle_scenario_04_upgrade_spec.rb b/Tests/Spec/tentacle_scenario_04_upgrade_spec.rb
@@ -61,5 +61,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/tentacle_scenario_05_watchdog_create_spec.rb b/Tests/Spec/tentacle_scenario_05_watchdog_create_spec.rb
@@ -7,5 +7,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/tentacle_scenario_06_watchdog_delete_spec.rb b/Tests/Spec/tentacle_scenario_06_watchdog_delete_spec.rb
@@ -7,5 +7,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/tentacle_scenario_07_remove_spec.rb b/Tests/Spec/tentacle_scenario_07_remove_spec.rb
@@ -21,5 +21,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end
diff --git a/Tests/Spec/tentacle_scenario_08_tentacle_comms_port_spec.rb b/Tests/Spec/tentacle_scenario_08_tentacle_comms_port_spec.rb
@@ -60,5 +60,6 @@
 
 describe windows_dsc do
   it { should be_able_to_get_dsc_configuration }
-  it { should have_applied_dsc_configuration_successfully }
+  it { should have_test_dsc_configuration_return_true }
+  it { should have_dsc_configuration_status_of_success }
 end