Added missing capitalisation changeprojects-section-button-capitalization

8 files changed, 54 insertions, 32 deletions

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 8631bc54509..bf05081d0b1 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -97,7 +97,7 @@ module BlobHelper
     if Gitlab::MarkupHelper.previewable?(filename)
       'Preview'
     else
-      'Preview Changes'
+      'Preview changes'
     end
   end
 
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index c4dca481d0a..8fe0bd149f3 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -19,4 +19,4 @@
       To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
 
   .prepend-top-default
-    = render 'shared/merge_requests'
\ No newline at end of file
+    = render 'shared/merge_requests'
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index aeeadec48da..f515a9c4c0c 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -101,7 +101,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I click link "Diff"' do
-    click_link 'Preview Changes'
+    click_link 'Preview changes'
   end
 
   step 'I click on "Commit changes"' do
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 009e9c6b04c..6f36c74c911 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -56,7 +56,7 @@ describe 'Auto deploy' do
         click_on 'OpenShift'
       end
       wait_for_ajax
-      click_button 'Commit Changes'
+      click_button 'Commit changes'
 
       expect(page).to have_content('New Merge Request From auto-deploy into master')
     end
diff --git a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
index 79105b1ee46..497240803d4 100644
--- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
+++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
@@ -32,7 +32,7 @@ feature 'Merge immediately', :feature, :js do
       page.within '.mr-widget-body' do
         find('.dropdown-toggle').click
 
-        click_link 'Merge Immediately'
+        click_link 'Merge immediately'
 
         expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress')
 
diff --git a/spec/features/projects/files/template_type_dropdown_spec.rb b/spec/features/projects/files/template_type_dropdown_spec.rb
index 5ee5e5b4c4e..a5e84df1c63 100644
--- a/spec/features/projects/files/template_type_dropdown_spec.rb
+++ b/spec/features/projects/files/template_type_dropdown_spec.rb
@@ -48,7 +48,7 @@ feature 'Template type dropdown selector', js: true do
 
     context 'user previews changes' do
       before do
-        click_link 'Preview Changes'
+        click_link 'Preview changes'
       end
 
       scenario 'type selector is hidden and shown correctly' do
@@ -130,6 +130,6 @@ end
 
 def create_and_edit_file(file_name)
   visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: file_name)
-  click_button "Commit Changes"
+  click_button "Commit changes"
   visit namespace_project_edit_blob_path(project.namespace, project, File.join(project.default_branch, file_name))
 end
diff --git a/spec/features/projects/wiki/markdown_preview_spec.rb b/spec/features/projects/wiki/markdown_preview_spec.rb
index 2ef0f4efaec..43d8b45669e 100644
--- a/spec/features/projects/wiki/markdown_preview_spec.rb
+++ b/spec/features/projects/wiki/markdown_preview_spec.rb
@@ -25,11 +25,15 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
     context "when there are no spaces or hyphens in the page name" do
       it "rewrites relative links as expected" do
         click_link 'New page'
-        fill_in :new_wiki_path, with: 'a/b/c/d'
-        click_button 'Create Page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a/b/c/d'
+          click_button 'Create page'
+        end
 
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -43,11 +47,15 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
     context "when there are spaces in the page name" do
       it "rewrites relative links as expected" do
         click_link 'New page'
-        fill_in :new_wiki_path, with: 'a page/b page/c page/d page'
-        click_button 'Create Page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a page/b page/c page/d page'
+          click_button 'Create page'
+        end
 
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -61,11 +69,15 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
     context "when there are hyphens in the page name" do
       it "rewrites relative links as expected" do
         click_link 'New page'
-        fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
-        click_button 'Create Page'
-
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
+          click_button 'Create page'
+        end
+        
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -80,10 +92,16 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
   context "while editing a wiki page" do
     def create_wiki_page(path)
       click_link 'New page'
-      fill_in :new_wiki_path, with: path
-      click_button 'Create Page'
-      fill_in :wiki_content, with: 'content'
-      click_on "Create page"
+
+      page.within '#modal-new-wiki' do
+        fill_in :new_wiki_path, with: path
+        click_button 'Create page'
+      end
+
+      page.within '.wiki-form' do
+        fill_in :wiki_content, with: 'content'
+        click_on "Create page"
+      end
     end
 
     context "when there are no spaces or hyphens in the page name" do
diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
index 3c147bd86a0..1ffac8cd542 100644
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
@@ -44,12 +44,13 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
             click_button 'Create page'
           end
 
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Create foo')
+
           page.within '.wiki-form' do
             fill_in :wiki_content, with: 'My awesome wiki!'
             click_button 'Create page'
           end
-          # Commit message field should have correct value.
-          expect(page).to have_field('wiki[message]', with: 'Create foo')
 
           expect(page).to have_content('Foo')
           expect(page).to have_content("Last edited by #{user.name}")
@@ -64,12 +65,13 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
             click_button 'Create page'
           end
 
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Create spaces in the name')
+
           page.within '.wiki-form' do
             fill_in :wiki_content, with: 'My awesome wiki!'
             click_button 'Create page'
           end
-          # Commit message field should have correct value.
-          expect(page).to have_field('wiki[message]', with: 'Create spaces in the name')
 
           expect(page).to have_content('Spaces in the name')
           expect(page).to have_content("Last edited by #{user.name}")
@@ -84,12 +86,13 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
             click_button 'Create page'
           end
 
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Create hyphens in the name')
+
           page.within '.wiki-form' do
             fill_in :wiki_content, with: 'My awesome wiki!'
             click_button 'Create page'
           end
-          # Commit message field should have correct value.
-          expect(page).to have_field('wiki[message]', with: 'Create hyphens in the name')
 
           expect(page).to have_content('Hyphens in the name')
           expect(page).to have_content("Last edited by #{user.name}")
@@ -132,12 +135,13 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
           click_button 'Create page'
         end
 
+        # Commit message field should have correct value.
+        expect(page).to have_field('wiki[message]', with: 'Create foo')
+
         page.within '.wiki-form' do
           fill_in :wiki_content, with: 'My awesome wiki!'
           click_button 'Create page'
         end
-        # Commit message field should have correct value.
-        expect(page).to have_field('wiki[message]', with: 'Create foo')
 
         expect(page).to have_content('Foo')
         expect(page).to have_content("Last edited by #{user.name}")