Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
9d0a1b62
Commit
9d0a1b62
authored
6 years ago
by
Michael Lange
Browse files
Options
Download
Email Patches
Plain Diff
Use PageObject for job versions tests
parent
ae10e4a8
Branches unavailable
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.4.0-rc.1
v1.4.0-beta.1
v1.3.8
v1.3.7
v1.3.6
v1.3.5
v1.3.4
v1.3.3
v1.3.2
v1.3.1
v1.3.0
v1.3.0-rc.1
v1.3.0-beta.1
v1.2.15
v1.2.14
v1.2.13
v1.2.12
v1.2.11
v1.2.10
v1.2.9
v1.2.8
v1.2.7
v1.2.6
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.2.0-rc1
v1.2.0-beta1
v1.1.18
v1.1.17
v1.1.16
v1.1.15
v1.1.14
v1.1.13
v1.1.12
v1.1.11
v1.1.10
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.1.0-rc1
v1.1.0-beta1
v1.0.18
v1.0.17
v1.0.16
v1.0.15
v1.0.14
v1.0.13
v1.0.12
v1.0.11
v1.0.10
v1.0.9
v1.0.8
v1.0.7
v1.0.6
v1.0.5
v1.0.4
v1.0.3
v1.0.2
v1.0.1
v1.0.0
v1.0.0-rc1
v1.0.0-beta3
v1.0.0-beta2
v0.12.12
v0.12.11
v0.12.10
v0.12.9
v0.12.8
v0.12.7
v0.12.6
v0.12.5
v0.12.4
v0.12.4-rc1
v0.12.3
v0.12.2
v0.12.1
v0.12.0
v0.12.0-rc1
v0.12.0-beta2
v0.12.0-beta1
v0.11.8
v0.11.7
v0.11.6
v0.11.5
v0.11.4
v0.11.3
v0.11.2
v0.11.1
v0.11.0
v0.11.0-rc1
v0.11.0-beta2
v0.11.0-beta1
v0.10.9
v0.10.8
v0.10.7
v0.10.6
v0.10.5
v0.10.4
v0.10.4-rc1
v0.10.3
v0.10.2
v0.10.2-rc1
v0.10.1
v0.10.0
v0.10.0-rc1
v0.10.0-connect1
v0.10.0-beta1
v0.9.7
v0.9.6
v0.9.5
v0.9.4
v0.9.4-rc1
v0.9.3
v0.9.2
v0.9.2-rc1
v0.9.1
v0.9.1-rc1
v0.9.0
v0.9.0-rc2
v0.9.0-rc1
v0.9.0-beta3
v0.9.0-beta2
v0.9.0-beta1
nightly
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ui/app/templates/components/job-version.hbs
+1
-1
ui/app/templates/components/job-version.hbs
ui/tests/acceptance/job-versions-test.js
+9
-22
ui/tests/acceptance/job-versions-test.js
ui/tests/pages/jobs/job/versions.js
+11
-0
ui/tests/pages/jobs/job/versions.js
with
21 additions
and
23 deletions
+21
-23
ui/app/templates/components/job-version.hbs
+
1
-
1
View file @
9d0a1b62
...
...
@@ -6,7 +6,7 @@
</span>
<span
class=
"pair is-faded"
>
<span
class=
"term"
>
Submitted
</span>
<span
data-test-version-submit-
dat
e
class=
"submit-date"
>
{{
moment-format
version
.
submitTime
"MM/DD/YY HH:mm:ss"
}}
</span>
<span
data-test-version-submit-
tim
e
class=
"submit-date"
>
{{
moment-format
version
.
submitTime
"MM/DD/YY HH:mm:ss"
}}
</span>
</span>
{{#if
version
.
diff
}}
<button
class=
"button is-light is-compact pull-right"
{{
action
"toggleDiff"
}}
>
{{
changeCount
}}
{{
pluralize
"Change"
changeCount
}}
</button>
...
...
This diff is collapsed.
Click to expand it.
ui/tests/acceptance/job-versions-test.js
+
9
-
22
View file @
9d0a1b62
import
{
find
,
findAll
,
visit
}
from
'
ember-native-dom-helpers
'
;
import
{
test
}
from
'
qunit
'
;
import
moduleForAcceptance
from
'
nomad-ui/tests/helpers/module-for-acceptance
'
;
import
Versions
from
'
nomad-ui/tests/pages/jobs/job/versions
'
;
import
moment
from
'
moment
'
;
let
job
;
...
...
@@ -11,33 +11,20 @@ moduleForAcceptance('Acceptance | job versions', {
job
=
server
.
create
(
'
job
'
,
{
createAllocations
:
false
});
versions
=
server
.
db
.
jobVersions
.
where
({
jobId
:
job
.
id
});
visit
(
`/jobs/
${
job
.
id
}
/versions`
);
Versions
.
visit
({
id
:
job
.
id
}
);
},
});
test
(
'
/jobs/:id/versions should list all job versions
'
,
function
(
assert
)
{
assert
.
ok
(
findAll
(
'
[data-test-version]
'
).
length
,
versions
.
length
,
'
Each version gets a row in the timeline
'
);
assert
.
ok
(
Versions
.
versions
.
length
,
versions
.
length
,
'
Each version gets a row in the timeline
'
);
});
test
(
'
each version mentions the version number, the stability, and the submitted time
'
,
function
(
assert
)
{
test
(
'
each version mentions the version number, the stability, and the submitted time
'
,
function
(
assert
)
{
const
version
=
versions
.
sortBy
(
'
submitTime
'
).
reverse
()[
0
];
const
versionRow
=
find
(
'
[data-test-version]
'
);
const
formattedSubmitTime
=
moment
(
version
.
submitTime
/
1000000
).
format
(
'
MM/DD/YY HH:mm:ss
'
);
const
versionRow
=
Versions
.
versions
.
objectAt
(
0
);
assert
.
ok
(
versionRow
.
textContent
.
includes
(
`Version #
${
version
.
version
}
`
),
'
Version #
'
);
assert
.
equal
(
versionRow
.
querySelector
(
'
[data-test-version-stability]
'
).
textContent
,
version
.
stable
.
toString
(),
'
Stability
'
);
assert
.
equal
(
versionRow
.
querySelector
(
'
[data-test-version-submit-date]
'
).
textContent
,
moment
(
version
.
submitTime
/
1000000
).
format
(
'
MM/DD/YY HH:mm:ss
'
),
'
Submit time
'
);
assert
.
ok
(
versionRow
.
text
.
includes
(
`Version #
${
version
.
version
}
`
),
'
Version #
'
);
assert
.
equal
(
versionRow
.
stability
,
version
.
stable
.
toString
(),
'
Stability
'
);
assert
.
equal
(
versionRow
.
submitTime
,
formattedSubmitTime
,
'
Submit time
'
);
});
This diff is collapsed.
Click to expand it.
ui/tests/pages/jobs/job/versions.js
0 → 100644
+
11
-
0
View file @
9d0a1b62
import
{
create
,
collection
,
text
,
visitable
}
from
'
ember-cli-page-object
'
;
export
default
create
({
visit
:
visitable
(
'
/jobs/:id/versions
'
),
versions
:
collection
(
'
[data-test-version]
'
,
{
text
:
text
(),
stability
:
text
(
'
[data-test-version-stability]
'
),
submitTime
:
text
(
'
[data-test-version-submit-time]
'
),
}),
});
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help