summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-08-09 22:42:07 +0000
committerStan Hu <stanhu@gmail.com>2015-08-09 22:42:07 +0000
commit1a3283d4e871c518d131eb3c9a82dce33f4609f8 (patch)
tree29ec6b67703c09894d8ea08e477eaaee29bc25ff /features
parentb833f208f3a31a6ac964dac422141249f2278fd9 (diff)
parent0f785bbc7ecf932e81c84ec98636ffd305994b47 (diff)
downloadgitlab-ce-1a3283d4e871c518d131eb3c9a82dce33f4609f8.tar.gz
Merge branch 'gravatar-host-link' into 'master'
link to configured gravatar host on profile page This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service. See merge request !1093
Diffstat (limited to 'features')
-rw-r--r--features/profile/profile.feature2
-rw-r--r--features/steps/profile/profile.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/features/profile/profile.feature b/features/profile/profile.feature
index 7a1345f2b37..27c0bde364e 100644
--- a/features/profile/profile.feature
+++ b/features/profile/profile.feature
@@ -35,6 +35,7 @@ Feature: Profile
Then I change my avatar
And I should see new avatar
And I should see the "Remove avatar" button
+ And I should see the gravatar host link
Scenario: I remove my avatar
Given I visit profile page
@@ -42,6 +43,7 @@ Feature: Profile
When I remove my avatar
Then I should see my gravatar
And I should not see the "Remove avatar" button
+ And I should see the gravatar host link
Scenario: My password is expired
Given my password is expired
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index 2b6b8b167f6..8cf24705a5e 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -59,6 +59,10 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step 'I should not see the "Remove avatar" button' do
expect(page).not_to have_link("Remove avatar")
end
+
+ step 'I should see the gravatar host link' do
+ expect(page).to have_link("gravatar.com")
+ end
step 'I try change my password w/o old one' do
page.within '.update-password' do