Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 13 deletions

diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
index 48686239297..d941988d12f 100644
--- a/spec/features/profiles/user_edit_profile_spec.rb
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe 'User edit profile' do
     fill_in 'user_skype', with: 'testskype'
     fill_in 'user_linkedin', with: 'testlinkedin'
     fill_in 'user_twitter', with: 'testtwitter'
-    fill_in 'user_website_url', with: 'http://testurl.com'
+    fill_in 'user_website_url', with: 'testurl'
     fill_in 'user_location', with: 'Ukraine'
     fill_in 'user_bio', with: 'I <3 GitLab :tada:'
     fill_in 'user_job_title', with: 'Frontend Engineer'
@@ -43,7 +43,7 @@ RSpec.describe 'User edit profile' do
       skype: 'testskype',
       linkedin: 'testlinkedin',
       twitter: 'testtwitter',
-      website_url: 'http://testurl.com',
+      website_url: 'testurl',
       bio: 'I <3 GitLab :tada:',
       bio_html: '<p data-sourcepos="1:1-1:18" dir="auto">I &lt;3 GitLab <gl-emoji title="party popper" data-name="tada" data-unicode-version="6.0">🎉</gl-emoji></p>',
       job_title: 'Frontend Engineer',
@@ -65,17 +65,6 @@ RSpec.describe 'User edit profile' do
     end
   end
 
-  it 'shows an error if the website url is not valid' do
-    fill_in 'user_website_url', with: 'admin@gitlab.com'
-    submit_settings
-
-    expect(user.reload).to have_attributes(
-      website_url: ''
-    )
-
-    expect(page).to have_content('Website url is not a valid URL')
-  end
-
   describe 'when I change my email' do
     before do
       user.send_reset_password_instructions