diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-03 17:33:27 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-03 17:33:27 +0000 |
| commit | 39340e428e3546d3749498ce10b19ae6cda0e646 (patch) | |
| tree | eac8c3a81d50e65b6834a337b6034e83a50679a7 | |
| parent | 3ad3f906d97c0cb2e3d91f04e8dd100937421420 (diff) | |
| parent | a9e0218cc5f8ee6309acb3121dd31397e17ef332 (diff) | |
| download | gitlab-ce-39340e428e3546d3749498ce10b19ae6cda0e646.tar.gz | |
Merge branch '32118-new-environment-btn-copy' into 'master'
32118 Make New environment empty state btn lowercase
Closes #32118
See merge request !11350
4 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/components/environment.vue b/app/assets/javascripts/environments/components/environment.vue index c9e489dd90e..28597c799df 100644 --- a/app/assets/javascripts/environments/components/environment.vue +++ b/app/assets/javascripts/environments/components/environment.vue @@ -255,7 +255,7 @@ export default { v-if="canCreateEnvironmentParsed" :href="newEnvironmentPath" class="btn btn-create js-new-environment-button"> - New Environment + New environment </a> </div> diff --git a/changelogs/unreleased/32118-new-environment-btn-copy.yml b/changelogs/unreleased/32118-new-environment-btn-copy.yml new file mode 100644 index 00000000000..16a51c3db6a --- /dev/null +++ b/changelogs/unreleased/32118-new-environment-btn-copy.yml @@ -0,0 +1,4 @@ +--- +title: Make New environment empty state btn lowercase +merge_request: +author: diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index cf393afccbb..31345403702 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -239,7 +239,9 @@ feature 'Environments page', :feature, :js do context 'when logged as developer' do before do - click_link 'New environment' + within(".top-area") do + click_link 'New environment' + end end context 'for valid name' do diff --git a/spec/javascripts/environments/environment_spec.js b/spec/javascripts/environments/environment_spec.js index 1c54cc3054c..c31642ac788 100644 --- a/spec/javascripts/environments/environment_spec.js +++ b/spec/javascripts/environments/environment_spec.js @@ -41,7 +41,7 @@ describe('Environment', () => { setTimeout(() => { expect( component.$el.querySelector('.js-new-environment-button').textContent, - ).toContain('New Environment'); + ).toContain('New environment'); expect( component.$el.querySelector('.js-blank-state-title').textContent, |