Commit eb7c16de authored by Filipa Lacerda's avatar Filipa Lacerda

Adds bottom margin to the environment info block

parent d7ef517b
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="prepend-top-default js-environment-container"> <div class="prepend-top-default append-bottom-default js-environment-container">
<div class="environment-information"> <div class="environment-information">
<ci-icon :status="iconStatus" /> <ci-icon :status="iconStatus" />
<p class="inline append-bottom-0" v-html="environment"></p> <p class="inline append-bottom-0" v-html="environment"></p>
......
...@@ -754,7 +754,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -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 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_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
end end
...@@ -764,7 +764,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -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 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_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
end end
...@@ -774,7 +774,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -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 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_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
end end
...@@ -783,7 +783,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -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 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_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
end end
...@@ -793,7 +793,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -793,7 +793,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it 'renders message about job being stuck because runners are offline' 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_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 end
end end
......
...@@ -160,9 +160,7 @@ describe('Job App ', () => { ...@@ -160,9 +160,7 @@ describe('Job App ', () => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.js-job-stuck')).not.toBeNull(); expect(vm.$el.querySelector('.js-job-stuck')).not.toBeNull();
expect(vm.$el.querySelector('.js-job-stuck').textContent).toContain( expect(vm.$el.querySelector('.js-job-stuck .js-stuck-no-active-runner')).not.toBeNull();
"This job is stuck, because you don't have any active runners that can run this job.",
);
done(); done();
}, 0); }, 0);
}); });
...@@ -195,9 +193,7 @@ describe('Job App ', () => { ...@@ -195,9 +193,7 @@ describe('Job App ', () => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.js-job-stuck').textContent).toContain(job.tags[0]); expect(vm.$el.querySelector('.js-job-stuck').textContent).toContain(job.tags[0]);
expect(vm.$el.querySelector('.js-job-stuck').textContent).toContain( expect(vm.$el.querySelector('.js-job-stuck .js-stuck-with-tags')).not.toBeNull();
"This job is stuck, because you don't have any active runners online with any of these tags assigned to them:",
);
done(); done();
}, 0); }, 0);
}); });
...@@ -230,9 +226,7 @@ describe('Job App ', () => { ...@@ -230,9 +226,7 @@ describe('Job App ', () => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.js-job-stuck').textContent).toContain(job.tags[0]); expect(vm.$el.querySelector('.js-job-stuck').textContent).toContain(job.tags[0]);
expect(vm.$el.querySelector('.js-job-stuck').textContent).toContain( expect(vm.$el.querySelector('.js-job-stuck .js-stuck-with-tags')).not.toBeNull();
"This job is stuck, because you don't have any active runners online with any of these tags assigned to them:",
);
done(); done();
}, 0); }, 0);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment