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
de273858
Commit
de273858
authored
7 years ago
by
Michael Lange
Browse files
Options
Download
Email Patches
Plain Diff
Inject system so namespace shows up on job detail components
parent
b7f57ec3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ui/app/components/job-page/abstract.js
+3
-0
ui/app/components/job-page/abstract.js
ui/tests/acceptance/job-detail-test.js
+5
-36
ui/tests/acceptance/job-detail-test.js
ui/tests/integration/job-page/periodic-test.js
+1
-4
ui/tests/integration/job-page/periodic-test.js
with
9 additions
and
40 deletions
+9
-40
ui/app/components/job-page/abstract.js
+
3
-
0
View file @
de273858
import
Component
from
'
@ember/component
'
;
import
{
computed
}
from
'
@ember/object
'
;
import
{
inject
as
service
}
from
'
@ember/service
'
;
export
default
Component
.
extend
({
system
:
service
(),
job
:
null
,
// Provide a value that is bound to a query param
...
...
This diff is collapsed.
Click to expand it.
ui/tests/acceptance/job-detail-test.js
+
5
-
36
View file @
de273858
import
{
click
,
findAll
,
currentURL
,
find
,
visit
}
from
'
ember-native-dom-helpers
'
;
import
{
skip
}
from
'
qunit
'
;
import
{
test
}
from
'
qunit
'
;
import
moduleForAcceptance
from
'
nomad-ui/tests/helpers/module-for-acceptance
'
;
import
moduleForJob
from
'
nomad-ui/tests/helpers/module-for-job
'
;
...
...
@@ -32,34 +32,7 @@ moduleForJob('Acceptance | job detail (service)', () => server.create('job', { t
let
job
;
skip
(
'
breadcrumbs includes job name and link back to the jobs list
'
,
function
(
assert
)
{
assert
.
equal
(
find
(
'
[data-test-breadcrumb="Jobs"]
'
).
textContent
,
'
Jobs
'
,
'
First breadcrumb says jobs
'
);
assert
.
equal
(
find
(
`[data-test-breadcrumb="
${
job
.
name
}
"]`
).
textContent
,
job
.
name
,
'
Second breadcrumb says the job name
'
);
click
(
find
(
'
[data-test-breadcrumb="Jobs"]
'
));
andThen
(()
=>
{
assert
.
equal
(
currentURL
(),
'
/jobs
'
,
'
First breadcrumb links back to jobs
'
);
});
});
skip
(
'
the job detail page should contain basic information about the job
'
,
function
(
assert
)
{
assert
.
ok
(
find
(
'
[data-test-job-status]
'
).
textContent
.
includes
(
job
.
status
),
'
Status
'
);
assert
.
ok
(
find
(
'
[data-test-job-stat="type"]
'
).
textContent
.
includes
(
job
.
type
),
'
Type
'
);
assert
.
ok
(
find
(
'
[data-test-job-stat="priority"]
'
).
textContent
.
includes
(
job
.
priority
),
'
Priority
'
);
assert
.
notOk
(
find
(
'
[data-test-job-stat="namespace"]
'
),
'
Namespace is not included
'
);
});
skip
(
'
when the job is not found, an error message is shown, but the URL persists
'
,
function
(
assert
)
{
test
(
'
when the job is not found, an error message is shown, but the URL persists
'
,
function
(
assert
)
{
visit
(
'
/jobs/not-a-real-job
'
);
andThen
(()
=>
{
...
...
@@ -82,14 +55,12 @@ moduleForAcceptance('Acceptance | job detail (with namespaces)', {
beforeEach
()
{
server
.
createList
(
'
namespace
'
,
2
);
server
.
create
(
'
node
'
);
job
=
server
.
create
(
'
job
'
,
{
namespaceId
:
server
.
db
.
namespaces
[
1
].
name
});
job
=
server
.
create
(
'
job
'
,
{
type
:
'
service
'
,
namespaceId
:
server
.
db
.
namespaces
[
1
].
name
});
server
.
createList
(
'
job
'
,
3
,
{
namespaceId
:
server
.
db
.
namespaces
[
0
].
name
});
},
});
skip
(
'
when there are namespaces, the job detail page states the namespace for the job
'
,
function
(
assert
)
{
test
(
'
when there are namespaces, the job detail page states the namespace for the job
'
,
function
(
assert
)
{
const
namespace
=
server
.
db
.
namespaces
.
find
(
job
.
namespaceId
);
visit
(
`/jobs/
${
job
.
id
}
?namespace=
${
namespace
.
name
}
`
);
...
...
@@ -101,9 +72,7 @@ skip('when there are namespaces, the job detail page states the namespace for th
});
});
skip
(
'
when switching namespaces, the app redirects to /jobs with the new namespace
'
,
function
(
assert
)
{
test
(
'
when switching namespaces, the app redirects to /jobs with the new namespace
'
,
function
(
assert
)
{
const
namespace
=
server
.
db
.
namespaces
.
find
(
job
.
namespaceId
);
const
otherNamespace
=
server
.
db
.
namespaces
.
toArray
().
find
(
ns
=>
ns
!==
namespace
).
name
;
const
label
=
otherNamespace
===
'
default
'
?
'
Default Namespace
'
:
otherNamespace
;
...
...
This diff is collapsed.
Click to expand it.
ui/tests/integration/job-page/periodic-test.js
+
1
-
4
View file @
de273858
import
{
run
}
from
'
@ember/runloop
'
;
import
{
getOwner
}
from
'
@ember/application
'
;
import
{
test
,
moduleForComponent
}
from
'
ember-qunit
'
;
import
{
click
,
find
,
findAll
}
from
'
ember-native-dom-helpers
'
;
import
{
click
,
findAll
}
from
'
ember-native-dom-helpers
'
;
import
wait
from
'
ember-test-helpers/wait
'
;
import
hbs
from
'
htmlbars-inline-precompile
'
;
import
sinon
from
'
sinon
'
;
import
{
clickTrigger
}
from
'
ember-power-select/test-support/helpers
'
;
import
{
startMirage
}
from
'
nomad-ui/initializers/ember-cli-mirage
'
;
moduleForComponent
(
'
job-page/periodic
'
,
'
Integration | Component | job-page/periodic
'
,
{
...
...
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