Merge branch 'gt-update-environments-empty-state' into 'master'
Update environments empty state See merge request gitlab-org/gitlab-ce!22297
This commit is contained in:
commit
d32ac958dd
|
@ -18,27 +18,28 @@ export default {
|
|||
};
|
||||
</script>
|
||||
<template>
|
||||
<div class="blank-state-row">
|
||||
<div class="blank-state-center">
|
||||
<h2 class="blank-state-title js-blank-state-title">
|
||||
{{ s__("Environments|You don't have any environments right now.") }}
|
||||
</h2>
|
||||
<div class="empty-state">
|
||||
<div class="text-content">
|
||||
<h4 class="blank-state-title js-blank-state-title">
|
||||
{{ s__("Environments|You don't have any environments right now") }}
|
||||
</h4>
|
||||
<p class="blank-state-text">
|
||||
{{ s__(`Environments|Environments are places where
|
||||
code gets deployed, such as staging or production.`) }}
|
||||
<br />
|
||||
code gets deployed, such as staging or production.`) }}
|
||||
<a :href="helpPath">
|
||||
{{ s__("Environments|Read more about environments") }}
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<a
|
||||
v-if="canCreateEnvironment"
|
||||
:href="newPath"
|
||||
class="btn btn-success js-new-environment-button"
|
||||
>
|
||||
{{ s__("Environments|New environment") }}
|
||||
</a>
|
||||
<div class="text-center">
|
||||
<a
|
||||
v-if="canCreateEnvironment"
|
||||
:href="newPath"
|
||||
class="btn btn-success js-new-environment-button"
|
||||
>
|
||||
{{ s__("Environments|New environment") }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Update environments empty state
|
||||
merge_request: 22297
|
||||
author: George Tsiolis
|
||||
type: other
|
|
@ -2600,7 +2600,7 @@ msgstr ""
|
|||
msgid "Environments|Updated"
|
||||
msgstr ""
|
||||
|
||||
msgid "Environments|You don't have any environments right now."
|
||||
msgid "Environments|You don't have any environments right now"
|
||||
msgstr ""
|
||||
|
||||
msgid "Epic"
|
||||
|
|
|
@ -95,7 +95,7 @@ describe 'Environments page', :js do
|
|||
end
|
||||
|
||||
it 'does not show environments and counters are set to zero' do
|
||||
expect(page).to have_content('You don\'t have any environments right now.')
|
||||
expect(page).to have_content('You don\'t have any environments right now')
|
||||
|
||||
expect(page.find('.js-environments-tab-available .badge').text).to eq('0')
|
||||
expect(page.find('.js-environments-tab-stopped .badge').text).to eq('0')
|
||||
|
|
|
@ -27,7 +27,7 @@ describe('environments empty state', () => {
|
|||
it('renders empty state and new environment button', () => {
|
||||
expect(
|
||||
vm.$el.querySelector('.js-blank-state-title').textContent.trim(),
|
||||
).toEqual('You don\'t have any environments right now.');
|
||||
).toEqual('You don\'t have any environments right now');
|
||||
|
||||
expect(
|
||||
vm.$el.querySelector('.js-new-environment-button').getAttribute('href'),
|
||||
|
@ -47,7 +47,7 @@ describe('environments empty state', () => {
|
|||
it('renders empty state without new button', () => {
|
||||
expect(
|
||||
vm.$el.querySelector('.js-blank-state-title').textContent.trim(),
|
||||
).toEqual('You don\'t have any environments right now.');
|
||||
).toEqual('You don\'t have any environments right now');
|
||||
|
||||
expect(
|
||||
vm.$el.querySelector('.js-new-environment-button'),
|
||||
|
|
|
@ -50,7 +50,7 @@ describe('Environment', () => {
|
|||
|
||||
expect(
|
||||
component.$el.querySelector('.js-blank-state-title').textContent,
|
||||
).toContain('You don\'t have any environments right now.');
|
||||
).toContain('You don\'t have any environments right now');
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -127,7 +127,7 @@ describe('Environment', () => {
|
|||
it('should render empty state', () => {
|
||||
expect(
|
||||
component.$el.querySelector('.js-blank-state-title').textContent,
|
||||
).toContain('You don\'t have any environments right now.');
|
||||
).toContain('You don\'t have any environments right now');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue