hybrid_platforms_conductor 33.0.0 → 33.0.1

data/spec/hybrid_platforms_conductor_test/docs_spec.rb

@@ -4,7 +4,7 @@ describe 'Documentation' do
     check_stdout = `bundle exec tools/check_md README.md #{Dir.glob('docs/**/*.md').join(' ')}`.split("\n")
     summary_idx = check_stdout.index { |line| line =~ /^\d+ errors:$/ }
     expect(summary_idx).not_to eq(nil), "Could not parse check output: #{check_stdout.join("\n")}"
-    expect(check_stdout[summary_idx]).to eq('0 errors:'), "Invalid links found: #{check_stdout[summary_idx..-1].join("\n")}"
+    expect(check_stdout[summary_idx]).to eq('0 errors:'), "Invalid links found: #{check_stdout[summary_idx..].join("\n")}"
   end
 
 end

data/spec/hybrid_platforms_conductor_test/executables/{check-node_spec.rb → check_node_spec.rb}

@@ -3,13 +3,11 @@ describe 'check-node executable' do
   # Setup a platform for check-node tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_check_node
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_check_node(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'checks a given node' do
@@ -21,7 +19,7 @@ describe 'check-node executable' do
       end
       exit_code, stdout, stderr = run 'check-node', '--node', 'node'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Check ok/
+      expect(stdout).to match(/Check ok/)
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/deploy_spec.rb

@@ -3,13 +3,11 @@ describe 'deploy executable' do
   # Setup a platform for deploy tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_deploy
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_deploy(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'deploys a given node' do
@@ -21,7 +19,7 @@ describe 'deploy executable' do
       end
       exit_code, stdout, stderr = run 'deploy', '--node', 'node'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Deploy ok/
+      expect(stdout).to match(/Deploy ok/)
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/get_impacted_nodes_spec.rb

@@ -3,20 +3,19 @@ describe 'get_impacted_nodes executable' do
   # Setup a platform for get_impacted_nodes tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_get_impacted_nodes
+  def with_test_platform_for_get_impacted_nodes(&block)
     with_test_platform(
       {
         nodes: {
           'node1' => { services: %w[service1] },
           'node2' => { services: %w[service2] }
         }
-      }
-    ) do |repository|
-      yield repository
-    end
+      },
+      &block
+    )
   end
 
   it 'returns nodes impacted by a git diff' do
@@ -26,22 +25,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: nil,
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -53,23 +52,23 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: nil,
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], true] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], true]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       * Potentially all nodes of this platform are impacted.
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        * Potentially all nodes of this platform are impacted.
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -81,22 +80,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'from_commit',
         to_commit: nil,
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform', '--from-commit', 'from_commit'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -108,22 +107,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: 'to_commit',
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform', '--to-commit', 'to_commit'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -135,22 +134,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: nil,
         smallest_set: true
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform', '--smallest-test-sample'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total smallest set):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total smallest set):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/last_deploys_spec.rb

@@ -3,13 +3,11 @@ describe 'last_deploys executable' do
   # Setup a platform for last_deploys tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_last_deploys
-    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_last_deploys(&block)
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }, &block)
   end
 
   it 'checks all nodes by default' do
@@ -46,14 +44,14 @@ describe 'last_deploys executable' do
       end
       exit_code, stdout, stderr = run 'last_deploys'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
+      expect(stdout).to eq <<~EO_STDOUT
         +-------+-------------------------+-------------+--------------------+-------+
         | Node  | Date                    | Admin       | Services           | Error |
         +-------+-------------------------+-------------+--------------------+-------+
         | node1 | 2019-08-21 10:12:15 UTC | admin_user1 | service1           |       |
         | node2 | 2019-08-22 10:12:15 UTC | admin_user2 | service1, service2 |       |
         +-------+-------------------------+-------------+--------------------+-------+
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -92,14 +90,14 @@ describe 'last_deploys executable' do
       end
       exit_code, stdout, stderr = run 'last_deploys', '--sort-by', 'user'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
+      expect(stdout).to eq <<~EO_STDOUT
         +-------+-------------------------+-------------+--------------------+-------+
         | Node  | Date                    | Admin       | Services           | Error |
         +-------+-------------------------+-------------+--------------------+-------+
         | node2 | 2019-08-22 10:12:15 UTC | admin_user1 | service1, service2 |       |
         | node1 | 2019-08-21 10:12:15 UTC | admin_user2 | service1           |       |
         +-------+-------------------------+-------------+--------------------+-------+
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -138,14 +136,14 @@ describe 'last_deploys executable' do
       end
       exit_code, stdout, stderr = run 'last_deploys', '--sort-by', 'user_desc'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
+      expect(stdout).to eq <<~EO_STDOUT
         +-------+-------------------------+-------------+--------------------+-------+
         | Node  | Date                    | Admin       | Services           | Error |
         +-------+-------------------------+-------------+--------------------+-------+
         | node1 | 2019-08-21 10:12:15 UTC | admin_user2 | service1           |       |
         | node2 | 2019-08-22 10:12:15 UTC | admin_user1 | service1, service2 |       |
         +-------+-------------------------+-------------+--------------------+-------+
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -171,13 +169,13 @@ describe 'last_deploys executable' do
       end
       exit_code, stdout, stderr = run 'last_deploys', '--node', 'node1'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
+      expect(stdout).to eq <<~EO_STDOUT
         +-------+-------------------------+-------------+----------+-------+
         | Node  | Date                    | Admin       | Services | Error |
         +-------+-------------------------+-------------+----------+-------+
         | node1 | 2019-08-21 10:12:15 UTC | admin_user1 | service1 |       |
         +-------+-------------------------+-------------+----------+-------+
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -206,14 +204,14 @@ describe 'last_deploys executable' do
       end
       exit_code, stdout, stderr = run 'last_deploys', '--sort-by', 'user_desc'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
+      expect(stdout).to eq <<~EO_STDOUT
         +-------+-------------------------+-------------+--------------------+--------------------------+
         | Node  | Date                    | Admin       | Services           | Error                    |
         +-------+-------------------------+-------------+--------------------+--------------------------+
         | node2 | 2019-08-22 10:12:15 UTC | admin_user2 | service1, service2 |                          |
         | node1 |                         |             |                    | Error while getting logs |
         +-------+-------------------------+-------------+--------------------+--------------------------+
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/nodes_to_deploy_spec.rb

@@ -4,213 +4,201 @@ describe 'nodes_to_deploy executable' do
   #
   # Parameters::
   # * *additional_platforms_content* (String): Additional platforms content to be added [default = '']
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_nodes_to_deploy(additional_platforms_content: '')
+  def with_test_platform_for_nodes_to_deploy(additional_platforms_content: '', &block)
     with_test_platform(
       { nodes: { 'node1' => {}, 'node2' => {} } },
-      false,
-      additional_platforms_content + "\nsend_logs_to :test_log"
-    ) do |repository|
-      yield repository
-    end
+      additional_config: "#{additional_platforms_content}\nsend_logs_to :test_log",
+      &block
+    )
   end
 
   it 'returns all nodes by default' do
     with_test_platform_for_nodes_to_deploy do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef1',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1 node2], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master').and_return [%w[node1 node2], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[node1 node2], [], [], false]
       exit_code, stdout, stderr = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
         node2
-      EOS
-      expect(stderr).to match /\[ node1 \] - No deployment schedule defined./
-      expect(stderr).to match /\[ node2 \] - No deployment schedule defined./
+      EO_STDOUT
+      expect(stderr).to match(/\[ node1 \] - No deployment schedule defined./)
+      expect(stderr).to match(/\[ node2 \] - No deployment schedule defined./)
     end
   end
 
   it 'can filter nodes' do
     with_test_platform_for_nodes_to_deploy do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node2]) do
-        {
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node2]).and_return(
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[node1 node2], [], [], false]
       exit_code, stdout, stderr = run 'nodes_to_deploy', '--node', 'node2'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node2
-      EOS
-      expect(stderr).not_to match /\[ node1 \] - No deployment schedule defined./
-      expect(stderr).to match /\[ node2 \] - No deployment schedule defined./
+      EO_STDOUT
+      expect(stderr).not_to match(/\[ node1 \] - No deployment schedule defined./)
+      expect(stderr).to match(/\[ node2 \] - No deployment schedule defined./)
     end
   end
 
   it 'does not return nodes that have no impact' do
     with_test_platform_for_nodes_to_deploy do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef1',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
-      exit_code, stdout, stderr = run 'nodes_to_deploy'
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master').and_return [%w[node1], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
-      EOS
+      EO_STDOUT
     end
   end
 
   it 'considers nodes having no repository info in their logs to be deployed' do
     with_test_platform_for_nodes_to_deploy do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {},
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {},
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
-      exit_code, stdout, stderr = run 'nodes_to_deploy'
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
-      EOS
+      EO_STDOUT
     end
   end
 
   it 'considers nodes having invalid commit ids in their logs to be deployed' do
     with_test_platform_for_nodes_to_deploy do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef1',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
+      )
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') do
         raise HybridPlatformsConductor::NodesHandler::GitError, 'Mocked git error due to an invalid commit id'
       end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
-      exit_code, stdout, stderr = run 'nodes_to_deploy'
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
-      EOS
+      EO_STDOUT
     end
   end
 
   it 'ignores impacts if asked' do
     with_test_platform_for_nodes_to_deploy do
-      exit_code, stdout, stderr = run 'nodes_to_deploy', '--ignore-deployed-info'
+      exit_code, stdout = run 'nodes_to_deploy', '--ignore-deployed-info'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
         node2
-      EOS
+      EO_STDOUT
     end
   end
 
@@ -219,28 +207,26 @@ describe 'nodes_to_deploy executable' do
       for_nodes(\'node1\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 120, duration: 60)) }
       for_nodes(\'node2\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 60, duration: 120)) }
     ') do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node2]) do
-        {
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node2]).and_return(
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[node1 node2], [], [], false]
       exit_code, stdout, stderr = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node2
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -250,29 +236,27 @@ describe 'nodes_to_deploy executable' do
       for_nodes(\'node1\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 120, duration: 60)) }
       for_nodes(\'node2\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 60, duration: 120)) }
     ') do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef1',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1 node2], [], [], false] }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master').and_return [%w[node1 node2], [], [], false]
       # 90 seconds before now, the schedule should match only node1
       exit_code, stdout, stderr = run 'nodes_to_deploy', '--deployment-time', (Time.now.utc - 90).strftime('%F %T')
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -282,183 +266,181 @@ describe 'nodes_to_deploy executable' do
       for_nodes(\'node1\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 120, duration: 60)) }
       for_nodes(\'node2\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 60, duration: 120)) }
     ') do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef1',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1 node2], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master').and_return [%w[node1 node2], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[node1 node2], [], [], false]
       exit_code, stdout, stderr = run 'nodes_to_deploy', '--ignore-schedule'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
         node2
-      EOS
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
 
   it 'considers impacts from several repositories' do
     with_test_platforms(
-      'platform1' => { nodes: { 'node1' => {}, 'node2' => {} } },
-      'platform2' => { nodes: {} }
+      {
+        'platform1' => { nodes: { 'node1' => {}, 'node2' => {} } },
+        'platform2' => { nodes: {} }
+      }
     ) do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform1',
-              commit_id_0: 'abcdef1',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform1',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform2',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform2',
-              commit_id_0: 'abcdef2',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master') { [%w[node2], [], [], false] }
-      exit_code, stdout, stderr = run 'nodes_to_deploy'
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master').and_return [%w[node1], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[node2], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
         node2
-      EOS
+      EO_STDOUT
     end
   end
 
   it 'considers impacts from several repositories for the same node as different services for different platforms might be deployed' do
     with_test_platforms(
-      'platform1' => { nodes: { 'node1' => {}, 'node2' => {} } },
-      'platform2' => { nodes: {} },
-      'platform3' => { nodes: {} }
+      {
+        'platform1' => { nodes: { 'node1' => {}, 'node2' => {} } },
+        'platform2' => { nodes: {} },
+        'platform3' => { nodes: {} }
+      }
     ) do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform1',
-              commit_id_0: 'abcdef1',
-              repo_name_1: 'platform2',
-              commit_id_1: '1234567',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform1',
+            commit_id_0: 'abcdef1',
+            repo_name_1: 'platform2',
+            commit_id_1: '1234567',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform2',
+            commit_id_0: 'abcdef2',
+            repo_name_1: 'platform3',
+            commit_id_1: '2345678',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform2',
-              commit_id_0: 'abcdef2',
-              repo_name_1: 'platform3',
-              commit_id_1: '2345678',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master') { [%w[], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: '1234567', to_commit: 'master') { [%w[node1], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform3', from_commit: '2345678', to_commit: 'master') { [%w[node2], [], [], false] }
-      exit_code, stdout, stderr = run 'nodes_to_deploy'
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master').and_return [%w[], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: '1234567', to_commit: 'master').and_return [%w[node1], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform3', from_commit: '2345678', to_commit: 'master').and_return [%w[node2], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
         node2
-      EOS
+      EO_STDOUT
     end
   end
 
   it 'considers impacts from several repositories for the same node but does not query diffs for the nodes we already know need deployment' do
     with_test_platforms(
-      'platform1' => { nodes: { 'node1' => {}, 'node2' => {} } },
-      'platform2' => { nodes: {} },
-      'platform3' => { nodes: {} }
+      {
+        'platform1' => { nodes: { 'node1' => {}, 'node2' => {} } },
+        'platform2' => { nodes: {} },
+        'platform3' => { nodes: {} }
+      }
     ) do
-      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
-        {
-          'node1' => {
-            services: %w[service1],
-            deployment_info: {
-              repo_name_0: 'platform1',
-              commit_id_0: 'abcdef1',
-              repo_name_1: 'platform2',
-              commit_id_1: '1234567',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform1',
+            commit_id_0: 'abcdef1',
+            repo_name_1: 'platform2',
+            commit_id_1: '1234567',
+            exit_status: 0
           },
-          'node2' => {
-            services: %w[service2],
-            deployment_info: {
-              repo_name_0: 'platform2',
-              commit_id_0: 'abcdef2',
-              repo_name_1: 'platform3',
-              commit_id_1: '2345678',
-              exit_status: 0
-            },
-            exit_status: 0,
-            stdout: '',
-            stderr: ''
-          }
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform2',
+            commit_id_0: 'abcdef2',
+            repo_name_1: 'platform3',
+            commit_id_1: '2345678',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
         }
-      end
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1], [], [], false] }
-      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master') { [%w[node2], [], [], false] }
-      exit_code, stdout, stderr = run 'nodes_to_deploy'
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master').and_return [%w[node1], [], [], false]
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[node2], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
+      expect(stdout).to eq <<~EO_STDOUT
         ===== Nodes to deploy =====
         node1
         node2
-      EOS
+      EO_STDOUT
     end
   end