feat: define commands as objects

Author: torchello

lib/appmap/service/test_command_provider.rb

@@ -13,21 +13,27 @@ def all
           if TestFrameworkDetector.rspec_present? && !integration_test_paths[:rspec].empty?
             commands << {
               framework: :rspec,
-              command: "APPMAP=true bundle exec rspec #{integration_test_paths[:rspec].join(' ')}"
+              command: {
+                program: 'bundle',
+                args: %w[exec rspec] + integration_test_paths[:rspec].map { |path| "./#{path}" },
+                environment: {
+                  APPMAP: 'true'
+                }
+              }
             }
           end
 
           if TestFrameworkDetector.minitest_present? && !integration_test_paths[:minitest].empty?
-            commands << {
-              framework: :minitest,
-              command: minitest_command
-            }
+            commands += minitest_commands
           end
-
           if TestFrameworkDetector.cucumber_present? && !integration_test_paths[:cucumber].empty?
             commands << {
               framework: :cucumber,
-              command: 'APPMAP=true bundle exec cucumber'
+              command: {
+                program: 'bundle',
+                args: %w[exec cucumber],
+                environment: { APPMAP: 'true' }
+              }
             }
           end
 
@@ -36,12 +42,29 @@ def all
 
         private
 
-        def minitest_command
+        def minitest_commands
           if Gem.loaded_specs.has_key?('rails')
-            "APPMAP=true bundle exec rails test #{integration_test_paths[:minitest].join(' ')}"
+            [
+              {
+                framework: :minitest,
+                command: {
+                  program: 'bundle',
+                  args: %w[exec rails test] + integration_test_paths[:minitest].map { |path| "./#{path}" },
+                  environment: { APPMAP: 'true' }
+                }
+              }
+            ]
           else
-            subcommands = integration_test_paths[:minitest].map { |path| "APPMAP=true bundle exec ruby #{path}" }
-            subcommands.join(' && ')
+            integration_test_paths[:minitest].map do |path|
+              {
+                framework: :minitest,
+                command: {
+                  program: 'bundle',
+                  args: ['exec', 'ruby', "./#{path}"],
+                  environment: { APPMAP: 'true' }
+                }
+              }
+            end
           end
         end
 

test/agent_setup_status_test.rb

@@ -27,39 +27,55 @@ def test_status_gem
   end
 
   def test_status_rails_app
-    def test_status
-      output = `cd spec/fixtures/rails6_users_app && bundle exec ../../../exe/appmap-agent-status`
-      assert_equal 0, $CHILD_STATUS.exitstatus
-      expected = {
-        test_commands: [
-          {
-            framework: :rspec,
-            command: 'APPMAP=true bundle exec rspec spec/controllers'
-          },
-          {
-            framework: :minitest,
-            command: 'APPMAP=true bundle exec ruby test/controllers && APPMAP=true bundle exec ruby test/integration'
-          },
-          {
-            framework: :cucumber,
-            command: 'APPMAP=true bundle exec cucumber'
+    output = `cd spec/fixtures/rails6_users_app && bundle exec ../../../exe/appmap-agent-status`
+    assert_equal 0, $CHILD_STATUS.exitstatus
+    expected = {
+      test_commands: [
+        {
+          framework: :rspec,
+          command: {
+            program: 'bundle',
+            args: %w[exec rspec ./spec/controllers],
+            environment: {
+              APPMAP: 'true'
+            }
+          }
+        },
+        {
+          framework: :minitest,
+          command: {
+            program: 'bundle',
+            args: %w[exec ruby ./test/controllers],
+            environment: {
+              APPMAP: 'true'
+            }
           }
-        ],
-        properties: {
-          config: {
-            app: nil,
-            present: true,
-            valid: true
-          },
-          project: {
-            agentVersion: AppMap::VERSION,
-            language: 'ruby',
-            remoteRecordingCapable: false,
-            integrationTests: true
+        },
+        {
+          framework: :minitest,
+          command: {
+            program: 'bundle',
+            args: %w[exec ruby ./test/integration],
+            environment: {
+              APPMAP: 'true'
+            }
           }
         }
+      ],
+      properties: {
+        config: {
+          app: nil,
+          present: true,
+          valid: false
+        },
+        project: {
+          agentVersion: AppMap::VERSION,
+          language: 'ruby',
+          remoteRecordingCapable: false,
+          integrationTests: true
+        }
       }
-      assert_equal JSON.pretty_generate(expected), output.strip
-    end
+    }
+    assert_equal JSON.pretty_generate(expected), output.strip
   end
 end