summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-06 15:34:30 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-06 19:50:48 +0300
commit105260314899303de4c70a1125b5ab69fb50e6d9 (patch)
tree93f8664ecfc276d1fef91ae7a60d599d7f44977b
parent6b90ccb9fd57401912e1978cbad28cc693a2e0a1 (diff)
downloadgitlab-ce-105260314899303de4c70a1125b5ab69fb50e6d9.tar.gz
Fix users feature spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--spec/features/users_spec.rb15
1 files changed, 2 insertions, 13 deletions
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index f2c0aa7784a..6498b7317b4 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -46,14 +46,8 @@ feature 'Users', feature: true do
scenario '/u/user1 redirects to user page' do
visit '/u/user1'
- expect_user_show_page
- end
-
-
- scenario '/users/user1 redirects to user page' do
- visit '/users/user1'
-
- expect_user_show_page
+ expect(current_path).to eq user_path(user)
+ expect(page).to have_text(user.name)
end
end
@@ -64,9 +58,4 @@ feature 'Users', feature: true do
def number_of_errors_on_page(page)
page.find('#error_explanation').find('ul').all('li').count
end
-
- def expect_user_show_page
- expect(current_path).to eq user_path(user)
- expect(page).to have_text(user.name)
- end
end