summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-01 14:37:49 +0000
committerPhil Hughes <me@iamphill.com>2016-03-04 09:06:07 +0000
commitc2377a11957c6e5f8514ff0d68b2af343d3427d0 (patch)
treea0622307daa02c147d839e18a552baea5776d55d
parent33ba32e6cc12eb8a8bddd957bb99bd2df7628a70 (diff)
downloadgitlab-ce-c2377a11957c6e5f8514ff0d68b2af343d3427d0.tar.gz
Fixed failing application settings tests
-rw-r--r--app/views/doorkeeper/applications/_form.html.haml2
-rw-r--r--features/profile/profile.feature3
-rw-r--r--features/steps/profile/profile.rb10
3 files changed, 5 insertions, 10 deletions
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml
index 0df8362d4ad..906b0676150 100644
--- a/app/views/doorkeeper/applications/_form.html.haml
+++ b/app/views/doorkeeper/applications/_form.html.haml
@@ -22,4 +22,4 @@
for local tests
.prepend-top-default
- = f.submit 'Add application', class: "btn btn-create"
+ = f.submit 'Save application', class: "btn btn-create"
diff --git a/features/profile/profile.feature b/features/profile/profile.feature
index 168d9d30b50..447dd92a458 100644
--- a/features/profile/profile.feature
+++ b/features/profile/profile.feature
@@ -76,8 +76,7 @@ Feature: Profile
Scenario: I can manage application
Given I visit profile applications page
- Then I click on new application button
- And I should see application form
+ Then I should see application form
Then I fill application form out and submit
And I see application
Then I click edit
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index 0c60328583a..b7d0a17b98e 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -180,18 +180,14 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end
end
- step 'I click on new application button' do
- click_on 'New Application'
- end
-
step 'I should see application form' do
- expect(page).to have_content "New Application"
+ expect(page).to have_content "Add new application"
end
step 'I fill application form out and submit' do
fill_in :doorkeeper_application_name, with: 'test'
fill_in :doorkeeper_application_redirect_uri, with: 'https://test.com'
- click_on "Submit"
+ click_on "Save application"
end
step 'I see application' do
@@ -211,7 +207,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step 'I change name of application and submit' do
expect(page).to have_content "Edit application"
fill_in :doorkeeper_application_name, with: 'test_changed'
- click_on "Submit"
+ click_on "Save application"
end
step 'I see that application was changed' do