diff --git a/awx/ui/npm-shrinkwrap.json b/awx/ui/npm-shrinkwrap.json index 54c1088cde..faec63cc41 100644 --- a/awx/ui/npm-shrinkwrap.json +++ b/awx/ui/npm-shrinkwrap.json @@ -3573,12 +3573,6 @@ "resolved": "https://registry.npmjs.org/jshint-stylish/-/jshint-stylish-2.2.1.tgz", "dev": true }, - "json-loader": { - "version": "0.5.4", - "from": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", - "dev": true - }, "json-schema": { "version": "0.2.3", "from": "json-schema@0.2.3", diff --git a/awx/ui/package.json b/awx/ui/package.json index 9454e406c7..7095b616a4 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -56,7 +56,6 @@ "jshint": "^2.9.4", "jshint-loader": "^0.8.3", "jshint-stylish": "^2.2.0", - "json-loader": "^0.5.4", "karma": "^1.4.1", "karma-chrome-launcher": "^1.0.1", "karma-coverage": "^1.1.1", diff --git a/awx/ui/tests/spec/workflow--results/data/workflow_job.json b/awx/ui/tests/spec/workflow--results/data/workflow_job.js similarity index 99% rename from awx/ui/tests/spec/workflow--results/data/workflow_job.json rename to awx/ui/tests/spec/workflow--results/data/workflow_job.js index 59cc9159b8..997c488e7a 100644 --- a/awx/ui/tests/spec/workflow--results/data/workflow_job.json +++ b/awx/ui/tests/spec/workflow--results/data/workflow_job.js @@ -1,4 +1,4 @@ -{ +export default { "id": 109, "type": "workflow_job", "url": "/api/v1/workflow_jobs/109/", @@ -60,4 +60,4 @@ "result_traceback": "", "workflow_job_template": 27, "extra_vars": "{}" -} \ No newline at end of file +}; \ No newline at end of file diff --git a/awx/ui/tests/spec/workflow--results/data/workflow_job_options.json b/awx/ui/tests/spec/workflow--results/data/workflow_job_options.js similarity index 99% rename from awx/ui/tests/spec/workflow--results/data/workflow_job_options.json rename to awx/ui/tests/spec/workflow--results/data/workflow_job_options.js index cf2ebd60d9..657d6f41fe 100644 --- a/awx/ui/tests/spec/workflow--results/data/workflow_job_options.json +++ b/awx/ui/tests/spec/workflow--results/data/workflow_job_options.js @@ -1,4 +1,4 @@ -{ +export default { "name": "Workflow Job Detail", "description": "# Retrieve Workflow Job:\n\nMake GET request to this resource to retrieve a single workflow job\nrecord containing the following fields:\n\n* `id`: Database ID for this workflow job. (integer)\n* `type`: Data type for this workflow job. (choice)\n* `url`: URL for this workflow job. (string)\n* `related`: Data structure with URLs of related resources. (object)\n* `summary_fields`: Data structure with name/description for related resources. (object)\n* `created`: Timestamp when this workflow job was created. (datetime)\n* `modified`: Timestamp when this workflow job was last modified. (datetime)\n* `name`: Name of this workflow job. (string)\n* `description`: Optional description of this workflow job. (string)\n* `unified_job_template`: (field)\n* `launch_type`: (choice)\n - `manual`: Manual\n - `relaunch`: Relaunch\n - `callback`: Callback\n - `scheduled`: Scheduled\n - `dependency`: Dependency\n - `workflow`: Workflow\n - `sync`: Sync\n* `status`: (choice)\n - `new`: New\n - `pending`: Pending\n - `waiting`: Waiting\n - `running`: Running\n - `successful`: Successful\n - `failed`: Failed\n - `error`: Error\n - `canceled`: Canceled\n* `failed`: (boolean)\n* `started`: The date and time the job was queued for starting. (datetime)\n* `finished`: The date and time the job finished execution. (datetime)\n* `elapsed`: Elapsed time in seconds that the job ran. (decimal)\n* `job_args`: (string)\n* `job_cwd`: (string)\n* `job_env`: (field)\n* `job_explanation`: A status field to indicate the state of the job if it wasn't able to run and capture stdout (string)\n* `result_stdout`: (field)\n* `execution_node`: The Tower node the job executed on. (string)\n* `result_traceback`: (string)\n* `workflow_job_template`: (field)\n* `extra_vars`: (string)\n\n\n\n# Delete Workflow Job:\n\nMake a DELETE request to this resource to delete this workflow job.\n\n\n\n\n\n\n\n\n\n\n\n> _New in Ansible Tower 3.1.0_", "renders": [