-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4994 from hashicorp/b-ui-dots-in-tasks
UI: Bugs around dots in task/task-group/driver names
- Loading branch information
Showing
12 changed files
with
703 additions
and
15 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
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
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,149 @@ | ||
| import { test } from 'ember-qunit'; | ||
| import AllocationModel from 'nomad-ui/models/allocation'; | ||
| import moduleForSerializer from '../../helpers/module-for-serializer'; | ||
|
|
||
| moduleForSerializer('allocation', 'Unit | Serializer | Allocation', { | ||
| needs: [ | ||
| 'service:token', | ||
| 'service:system', | ||
| 'serializer:allocation', | ||
| 'transform:fragment', | ||
| 'transform:fragment-array', | ||
| 'model:job', | ||
| 'model:node', | ||
| 'model:namespace', | ||
| 'model:evaluation', | ||
| 'model:allocation', | ||
| 'model:resources', | ||
| 'model:task-state', | ||
| 'model:reschedule-event', | ||
| ], | ||
| }); | ||
|
|
||
| const sampleDate = new Date('2018-12-12T00:00:00'); | ||
| const normalizationTestCases = [ | ||
| { | ||
| name: 'Normal', | ||
| in: { | ||
| ID: 'test-allocation', | ||
| JobID: 'test-summary', | ||
| Name: 'test-summary[1]', | ||
| Namespace: 'test-namespace', | ||
| TaskGroup: 'test-group', | ||
| CreateTime: +sampleDate * 1000000, | ||
| ModifyTime: +sampleDate * 1000000, | ||
| TaskStates: { | ||
| testTask: { | ||
| State: 'running', | ||
| Failed: false, | ||
| }, | ||
| }, | ||
| }, | ||
| out: { | ||
| data: { | ||
| id: 'test-allocation', | ||
| type: 'allocation', | ||
| attributes: { | ||
| taskGroupName: 'test-group', | ||
| name: 'test-summary[1]', | ||
| modifyTime: sampleDate, | ||
| createTime: sampleDate, | ||
| states: [ | ||
| { | ||
| name: 'testTask', | ||
| state: 'running', | ||
| failed: false, | ||
| }, | ||
| ], | ||
| }, | ||
| relationships: { | ||
| followUpEvaluation: { | ||
| data: null, | ||
| }, | ||
| nextAllocation: { | ||
| data: null, | ||
| }, | ||
| previousAllocation: { | ||
| data: null, | ||
| }, | ||
| job: { | ||
| data: { | ||
| id: '["test-summary","test-namespace"]', | ||
| type: 'job', | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
||
| { | ||
| name: 'Dots in task names', | ||
| in: { | ||
| ID: 'test-allocation', | ||
| JobID: 'test-summary', | ||
| Name: 'test-summary[1]', | ||
| Namespace: 'test-namespace', | ||
| TaskGroup: 'test-group', | ||
| CreateTime: +sampleDate * 1000000, | ||
| ModifyTime: +sampleDate * 1000000, | ||
| TaskStates: { | ||
| 'one.two': { | ||
| State: 'running', | ||
| Failed: false, | ||
| }, | ||
| 'three.four': { | ||
| State: 'pending', | ||
| Failed: true, | ||
| }, | ||
| }, | ||
| }, | ||
| out: { | ||
| data: { | ||
| id: 'test-allocation', | ||
| type: 'allocation', | ||
| attributes: { | ||
| taskGroupName: 'test-group', | ||
| name: 'test-summary[1]', | ||
| modifyTime: sampleDate, | ||
| createTime: sampleDate, | ||
| states: [ | ||
| { | ||
| name: 'one.two', | ||
| state: 'running', | ||
| failed: false, | ||
| }, | ||
| { | ||
| name: 'three.four', | ||
| state: 'pending', | ||
| failed: true, | ||
| }, | ||
| ], | ||
| }, | ||
| relationships: { | ||
| followUpEvaluation: { | ||
| data: null, | ||
| }, | ||
| nextAllocation: { | ||
| data: null, | ||
| }, | ||
| previousAllocation: { | ||
| data: null, | ||
| }, | ||
| job: { | ||
| data: { | ||
| id: '["test-summary","test-namespace"]', | ||
| type: 'job', | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
||
| normalizationTestCases.forEach(testCase => { | ||
| test(`normalization: ${testCase.name}`, function(assert) { | ||
| assert.deepEqual(this.subject().normalize(AllocationModel, testCase.in), testCase.out); | ||
| }); | ||
| }); |
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,129 @@ | ||
| import { test } from 'ember-qunit'; | ||
| import DeploymentModel from 'nomad-ui/models/deployment'; | ||
| import moduleForSerializer from '../../helpers/module-for-serializer'; | ||
|
|
||
| moduleForSerializer('deployment', 'Unit | Serializer | Deployment', { | ||
| needs: [ | ||
| 'adapter:application', | ||
| 'serializer:deployment', | ||
| 'service:system', | ||
| 'service:token', | ||
| 'transform:fragment-array', | ||
| 'model:allocation', | ||
| 'model:job', | ||
| 'model:task-group-deployment-summary', | ||
| ], | ||
| }); | ||
|
|
||
| const normalizationTestCases = [ | ||
| { | ||
| name: 'Normal', | ||
| in: { | ||
| ID: 'test-deployment', | ||
| JobID: 'test-job', | ||
| Namespace: 'test-namespace', | ||
| Status: 'canceled', | ||
| TaskGroups: { | ||
| taskGroup: { | ||
| DesiredCanaries: 2, | ||
| }, | ||
| }, | ||
| }, | ||
| out: { | ||
| data: { | ||
| id: 'test-deployment', | ||
| type: 'deployment', | ||
| attributes: { | ||
| status: 'canceled', | ||
| taskGroupSummaries: [ | ||
| { | ||
| name: 'taskGroup', | ||
| desiredCanaries: 2, | ||
| }, | ||
| ], | ||
| }, | ||
| relationships: { | ||
| allocations: { | ||
| links: { | ||
| related: '/v1/deployment/allocations/test-deployment', | ||
| }, | ||
| }, | ||
| job: { | ||
| data: { | ||
| id: '["test-job","test-namespace"]', | ||
| type: 'job', | ||
| }, | ||
| }, | ||
| jobForLatest: { | ||
| data: { | ||
| id: '["test-job","test-namespace"]', | ||
| type: 'job', | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
||
| { | ||
| name: 'Dots in task group names', | ||
| in: { | ||
| ID: 'test-deployment', | ||
| JobID: 'test-job', | ||
| Namespace: 'test-namespace', | ||
| Status: 'canceled', | ||
| TaskGroups: { | ||
| 'one.two': { | ||
| DesiredCanaries: 2, | ||
| }, | ||
| 'three.four': { | ||
| DesiredCanaries: 3, | ||
| }, | ||
| }, | ||
| }, | ||
| out: { | ||
| data: { | ||
| id: 'test-deployment', | ||
| type: 'deployment', | ||
| attributes: { | ||
| status: 'canceled', | ||
| taskGroupSummaries: [ | ||
| { | ||
| name: 'one.two', | ||
| desiredCanaries: 2, | ||
| }, | ||
| { | ||
| name: 'three.four', | ||
| desiredCanaries: 3, | ||
| }, | ||
| ], | ||
| }, | ||
| relationships: { | ||
| allocations: { | ||
| links: { | ||
| related: '/v1/deployment/allocations/test-deployment', | ||
| }, | ||
| }, | ||
| job: { | ||
| data: { | ||
| id: '["test-job","test-namespace"]', | ||
| type: 'job', | ||
| }, | ||
| }, | ||
| jobForLatest: { | ||
| data: { | ||
| id: '["test-job","test-namespace"]', | ||
| type: 'job', | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
||
| normalizationTestCases.forEach(testCase => { | ||
| test(`normalization: ${testCase.name}`, function(assert) { | ||
| assert.deepEqual(this.subject().normalize(DeploymentModel, testCase.in), testCase.out); | ||
| }); | ||
| }); |
Oops, something went wrong.