-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Scottx611x/tool manager updates (#1805)
* Generic Selenium testing base class & tool_manager tests refactoring * Update isort.cfg to include selenium_testing * Simplify view * Simplify ToolDefinition generation * Add more test coverage & cleanup * Add `annotation` field to ToolDefinition & `tool_launch_configuration` to Tool * Fix tests and add more test coverage * Add trailing slash
- Loading branch information
1 parent
993e3ce
commit ee36d10
Showing
9 changed files
with
464 additions
and
300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
refinery/tool_manager/migrations/0018_auto_20170615_1629.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('tool_manager', '0017_tooldefinition_extra_directories'), | ||
] | ||
|
||
operations = [ | ||
migrations.RenameField( | ||
model_name='tool', | ||
old_name='file_relationships', | ||
new_name='tool_launch_configuration', | ||
), | ||
migrations.RemoveField( | ||
model_name='tool', | ||
name='parameters', | ||
), | ||
migrations.RemoveField( | ||
model_name='tooldefinition', | ||
name='extra_directories', | ||
), | ||
migrations.AddField( | ||
model_name='tooldefinition', | ||
name='annotation', | ||
field=models.TextField(default='{}'), | ||
preserve_default=False, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
refinery/tool_manager/test_data/workflows/LIST:PAIR:LIST.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
{ "name": "Test LIST:PAIR:LIST", | ||
"tool_type": "WORKFLOW", | ||
"galaxy_workflow_id": "66b2fe95-9250-425d-86ae-5953c1d6e5b6", | ||
"annotation": { | ||
"refinery_type": "analysis", | ||
"description": "This workflow has a nested LIST of PAIRs of LISTs", | ||
"parameters": [ | ||
{ | ||
"name": "Integer Param", | ||
"description": "Integer Param description", | ||
"value_type": "INTEGER", | ||
"default_value": 1337, | ||
"galaxy_workflow_step": 1 | ||
}, | ||
{ | ||
"name": "Attribute Param", | ||
"description": "Attribute Param description", | ||
"value_type": "ATTRIBUTE", | ||
"default_value": "Species", | ||
"galaxy_workflow_step": 4 | ||
}, | ||
{ | ||
"name": "File Param", | ||
"description": "File Param description", | ||
"value_type": "FILE", | ||
"default_value": "/media/file_store/file.cool", | ||
"galaxy_workflow_step": 5 | ||
} | ||
], | ||
"output_files": [ | ||
{ | ||
"filetype": {"name": "FASTQ"}, | ||
"name": "Cool Input File", | ||
"description": "Cool Input File Description" | ||
} | ||
], | ||
"file_relationship": { | ||
"value_type": "LIST", | ||
"name": "List of Pairs", | ||
"file_relationship": { | ||
"value_type": "PAIR", | ||
"name": "Pair of Lists", | ||
"file_relationship": { | ||
"file_relationship": {}, | ||
"value_type": "LIST", | ||
"name": "Lists", | ||
"input_files": [ | ||
{ | ||
"allowed_filetypes": [ | ||
{"name": "FASTQ"}, | ||
{"name": "BAM"} | ||
], | ||
"name": "Cool Input Files", | ||
"description": "Cool Input Files Description" | ||
} | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.