Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-04-04 21:06:32 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-04-06 22:58:57 +0300
commit7592137f218a1a5ef0a8031846cc93ecf185dd9f (patch)
tree257e3739708f4e3996bfca07f0fbd70edd2de606 /features
parent0e325ea6ee625ad24709dd1118e36803bbaa222e (diff)
Fix rspec and spinach tests
Diffstat (limited to 'features')
-rw-r--r--features/project/source/browse_files.feature14
-rw-r--r--features/steps/dashboard/dashboard.rb6
-rw-r--r--features/steps/project/source/browse_files.rb4
3 files changed, 12 insertions, 12 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index 5ede935c562..894c4a96bb8 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -36,7 +36,7 @@ Feature: Project Source Browse Files
And I edit code
And I fill the new file name
And I fill the commit message
- And I click on "Commit Changes"
+ And I click on "Commit changes"
Then I am redirected to the new file
And I should see its new content
@@ -47,7 +47,7 @@ Feature: Project Source Browse Files
And I edit code
And I fill the new file name
And I fill the commit message
- And I click on "Commit Changes"
+ And I click on "Commit changes"
Then I am redirected to the fork's new merge request page
And I can see the new commit message
@@ -57,7 +57,7 @@ Feature: Project Source Browse Files
And I edit code with new lines at end of file
And I fill the new file name
And I fill the commit message
- And I click on "Commit Changes"
+ And I click on "Commit changes"
Then I am redirected to the new file
And I click button "Edit"
And I should see its content with new lines preserved at end of file
@@ -69,7 +69,7 @@ Feature: Project Source Browse Files
And I fill the new file name
And I fill the commit message
And I fill the new branch name
- And I click on "Commit Changes"
+ And I click on "Commit changes"
Then I am redirected to the new merge request page
When I click on "Changes" tab
And I should see its new content
@@ -173,7 +173,7 @@ Feature: Project Source Browse Files
And I click button "Edit"
And I edit code
And I fill the commit message
- And I click on "Commit Changes"
+ And I click on "Commit changes"
Then I am redirected to the ".gitignore"
And I should see its new content
@@ -186,7 +186,7 @@ Feature: Project Source Browse Files
And I click button "Fork"
And I edit code
And I fill the commit message
- And I click on "Commit Changes"
+ And I click on "Commit changes"
Then I am redirected to the fork's new merge request page
And I can see the new commit message
@@ -197,7 +197,7 @@ Feature: Project Source Browse Files
And I edit code
And I fill the commit message
And I fill the new branch name
- And I click on "Commit Changes"
+ And I click on "Commit changes"
Then I am redirected to the new merge request page
Then I click on "Changes" tab
And I should see its new content
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index 33a1c88e33c..c715c85c43c 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -18,11 +18,11 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
step 'I should see last push widget' do
expect(page).to have_content "You pushed to fix"
- expect(page).to have_link "Create Merge Request"
+ expect(page).to have_link "Create merge request"
end
- step 'I click "Create Merge Request" link' do
- click_link "Create Merge Request"
+ step 'I click "Create merge request" link' do
+ click_link "Create merge request"
end
step 'I see prefilled new Merge Request page' do
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 29f628763db..553e397339e 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -108,8 +108,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
click_link 'Preview Changes'
end
- step 'I click on "Commit Changes"' do
- click_button 'Commit Changes'
+ step 'I click on "Commit changes"' do
+ click_button 'Commit changes'
end
step 'I click on "Changes" tab' do