Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
eb7c16de
Commit
eb7c16de
authored
Nov 28, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds bottom margin to the environment info block
parent
d7ef517b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
15 deletions
+9
-15
app/assets/javascripts/jobs/components/environments_block.vue
...assets/javascripts/jobs/components/environments_block.vue
+1
-1
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+5
-5
spec/javascripts/jobs/components/job_app_spec.js
spec/javascripts/jobs/components/job_app_spec.js
+3
-9
No files found.
app/assets/javascripts/jobs/components/environments_block.vue
View file @
eb7c16de
...
...
@@ -128,7 +128,7 @@ export default {
};
</
script
>
<
template
>
<div
class=
"prepend-top-default js-environment-container"
>
<div
class=
"prepend-top-default
append-bottom-default
js-environment-container"
>
<div
class=
"environment-information"
>
<ci-icon
:status=
"iconStatus"
/>
<p
class=
"inline append-bottom-0"
v-html=
"environment"
></p>
...
...
spec/features/projects/jobs_spec.rb
View file @
eb7c16de
...
...
@@ -754,7 +754,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it
'renders message about job being stuck because no runners are active'
do
expect
(
page
).
to
have_css
(
'.js-stuck-no-active-runner'
)
expect
(
page
).
to
have_content
(
"This job is stuck
,
because you don't have any active runners that can run this job."
)
expect
(
page
).
to
have_content
(
"This job is stuck because you don't have any active runners that can run this job."
)
end
end
...
...
@@ -764,7 +764,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it
'renders message about job being stuck because of no runners with the specified tags'
do
expect
(
page
).
to
have_css
(
'.js-stuck-with-tags'
)
expect
(
page
).
to
have_content
(
"This job is stuck
,
because you don't have any active runners online with any of these tags assigned to them:"
)
expect
(
page
).
to
have_content
(
"This job is stuck because you don't have any active runners online with any of these tags assigned to them:"
)
end
end
...
...
@@ -774,7 +774,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it
'renders message about job being stuck because of no runners with the specified tags'
do
expect
(
page
).
to
have_css
(
'.js-stuck-with-tags'
)
expect
(
page
).
to
have_content
(
"This job is stuck
,
because you don't have any active runners online with any of these tags assigned to them:"
)
expect
(
page
).
to
have_content
(
"This job is stuck because you don't have any active runners online with any of these tags assigned to them:"
)
end
end
...
...
@@ -783,7 +783,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it
'renders message about job being stuck because not runners are available'
do
expect
(
page
).
to
have_css
(
'.js-stuck-no-active-runner'
)
expect
(
page
).
to
have_content
(
"This job is stuck
,
because you don't have any active runners that can run this job."
)
expect
(
page
).
to
have_content
(
"This job is stuck because you don't have any active runners that can run this job."
)
end
end
...
...
@@ -793,7 +793,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it
'renders message about job being stuck because runners are offline'
do
expect
(
page
).
to
have_css
(
'.js-stuck-no-runners'
)
expect
(
page
).
to
have_content
(
"This job is stuck
,
because the project doesn't have any runners online assigned to it."
)
expect
(
page
).
to
have_content
(
"This job is stuck because the project doesn't have any runners online assigned to it."
)
end
end
end
...
...
spec/javascripts/jobs/components/job_app_spec.js
View file @
eb7c16de
...
...
@@ -160,9 +160,7 @@ describe('Job App ', () => {
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck
'
).
textContent
).
toContain
(
"
This job is stuck, because you don't have any active runners that can run this job.
"
,
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck .js-stuck-no-active-runner
'
)).
not
.
toBeNull
();
done
();
},
0
);
});
...
...
@@ -195,9 +193,7 @@ describe('Job App ', () => {
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck
'
).
textContent
).
toContain
(
job
.
tags
[
0
]);
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck
'
).
textContent
).
toContain
(
"
This job is stuck, because you don't have any active runners online with any of these tags assigned to them:
"
,
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck .js-stuck-with-tags
'
)).
not
.
toBeNull
();
done
();
},
0
);
});
...
...
@@ -230,9 +226,7 @@ describe('Job App ', () => {
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck
'
).
textContent
).
toContain
(
job
.
tags
[
0
]);
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck
'
).
textContent
).
toContain
(
"
This job is stuck, because you don't have any active runners online with any of these tags assigned to them:
"
,
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-stuck .js-stuck-with-tags
'
)).
not
.
toBeNull
();
done
();
},
0
);
});
...
...
Write
Preview
Markdown
is supported
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