TRS tweaks tests for Git-versioned workflows.

Possibly fixes #614 by using version name for TRS Tool Version name, which will the same as the git branch/tag name if imported from git repo

Author: fbacall

app/controllers/workflows_controller.rb

@@ -134,7 +134,6 @@ def create_from_git
     end
   end
 
-
   #
   # # Displays the form Wizard for providing the metadata for the workflow
   # def provide_metadata

app/models/ga4gh/trs/v2/tool.rb

@@ -23,7 +23,7 @@ def organization
         end
 
         def versions
-          super.map { |v| ToolVersion.new(self, v) }
+          all_versions.map { |v| ToolVersion.new(self, v) }
         end
 
         def toolclass

app/models/ga4gh/trs/v2/tool_version.rb

@@ -26,7 +26,7 @@ def tool_id
         end
 
         def name
-          title
+          @workflow_version.is_a?(GitVersion) ? @workflow_version.name : title
         end
 
         def authors

lib/seek/git/versioning_compatibility.rb

@@ -15,12 +15,16 @@ def find_version(version)
       end
 
       def describe_version(version_number)
-        vs = is_git_versioned? ? git_versions : versions
+        vs = all_versions
 
         return '(earliest)' if version_number == vs.first.version
         return '(latest)' if version_number == vs.last.version
         ''
       end
+
+      def all_versions
+        is_git_versioned? ? git_versions : versions
+      end
     end
   end
 end

test/factories/git.rb

@@ -31,7 +31,7 @@
   f.name 'version 1.0.0'
   f.ref 'refs/heads/master'
   f.mutable true
-  end
+end
 
 Factory.define(:remote_git_version, class: GitVersion) do |f|
   f.git_repository { Factory(:remote_repository) }

test/factories/workflows.rb

@@ -169,3 +169,18 @@
   f.association :content_blob, factory: :spaces_ro_crate
   f.workflow_class { WorkflowClass.find_by_title('Jupyter Notebook') || Factory(:jupyter_workflow_class) }
 end
+
+Factory.define(:remote_git_workflow, class: Workflow) do |f|
+  f.title 'Concat two files'
+  f.with_project_contributor
+  f.workflow_class { WorkflowClass.find_by_key('galaxy') || Factory(:galaxy_workflow_class) }
+  f.git_version_attributes {
+    repo = Factory(:remote_repository)
+    { git_repository_id: repo.id,
+      ref: 'refs/heads/main',
+      commit: 'b6312caabe582d156dd351fab98ce78356c4b74c',
+      main_workflow_path: 'concat_two_files.ga',
+      diagram_path: 'diagram.png',
+    }
+  }
+end

test/fixtures/git/fixture-workflow/description.txt

@@ -0,0 +1,8 @@
+# Basic galaxy workflow
+# Branches: main, add-license-1
+# Tags: v0.01
+# Files on branch "main":
+concat_two_files.ga
+diagram.png
+LICENSE
+README.md

test/fixtures/git/local-fixture-workflow/description.txt

@@ -0,0 +1,6 @@
+# Basic galaxy workflow with abstract CWL
+# Branches: master
+# Files on branch "main":
+Concat_two_files.cwl
+concat_two_files.ga
+diagram.png

test/functional/ga4gh/trs/v2/tool_versions_controller_test.rb

@@ -220,6 +220,43 @@ class ToolVersionsControllerTest < ActionController::TestCase
           r = JSON.parse(@response.body)
           assert_equal [], r
         end
+
+        # Git
+
+        test 'should list tool version files for correct descriptor on git workflow' do
+          workflow = Factory(:remote_git_workflow, policy: Factory(:public_policy))
+
+          get :files, params: { id: workflow.id, version_id: 1, type: 'GALAXY' }
+
+          assert_response :success
+          r = JSON.parse(@response.body)
+          assert_equal 6, r.length
+          galaxy = r.detect { |f| f['path'] == 'concat_two_files.ga' }
+          diagram = r.detect { |f| f['path'] == 'diagram.png' }
+          assert galaxy
+          assert_equal 'PRIMARY_DESCRIPTOR', galaxy['file_type']
+          assert diagram
+          assert_equal 'OTHER', diagram['file_type']
+        end
+
+        test 'should get main workflow as primary descriptor on git workflow' do
+          workflow = Factory(:remote_git_workflow, policy: Factory(:public_policy))
+
+          get :descriptor, params: { id: workflow.id, version_id: 1, type: 'GALAXY' }
+
+          assert_response :success
+          assert @response.body.include?('a_galaxy_workflow')
+        end
+
+        test 'should get descriptor file via relative path on git workflow' do
+          workflow = Factory(:remote_git_workflow, policy: Factory(:public_policy))
+
+          get :descriptor, params: { id: workflow.id, version_id: 1, type: 'GALAXY', relative_path: 'concat_two_files.ga' }
+
+          assert_response :success
+          assert_equal 'application/json; charset=utf-8', @response.headers['Content-Type']
+          assert @response.body.include?('a_galaxy_workflow')
+        end
       end
     end
   end