summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-13 14:11:26 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-13 14:11:26 +0300
commitbc4d732af126277b3e85aedce795158bd389fbea (patch)
tree9811a1527cb450fce23c2b2bec76ce1686bdd571
parent2c5a95cbeb3ac4a19ad177d03d2703235e1f1c3c (diff)
downloadgitlab-ce-bc4d732af126277b3e85aedce795158bd389fbea.tar.gz
Update users routing spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--spec/features/users_spec.rb12
-rw-r--r--spec/routing/routing_spec.rb12
2 files changed, 18 insertions, 6 deletions
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 6498b7317b4..c78c84dc5d0 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -49,6 +49,18 @@ feature 'Users', feature: true do
expect(current_path).to eq user_path(user)
expect(page).to have_text(user.name)
end
+
+ scenario '/u/user1/groups redirects to user groups page' do
+ visit '/u/user1/groups'
+
+ expect(current_path).to eq user_groups_path(user)
+ end
+
+ scenario '/u/user1/projects redirects to user projects page' do
+ visit '/u/user1/projects'
+
+ expect(current_path).to eq user_projects_path(user)
+ end
end
def errors_on_page(page)
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 0ee1c811dfb..f848d96c729 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -15,27 +15,27 @@ describe UsersController, "routing" do
end
it "to #groups" do
- expect(get("/u/User/groups")).to route_to('users#groups', username: 'User')
+ expect(get("/users/User/groups")).to route_to('users#groups', username: 'User')
end
it "to #projects" do
- expect(get("/u/User/projects")).to route_to('users#projects', username: 'User')
+ expect(get("/users/User/projects")).to route_to('users#projects', username: 'User')
end
it "to #contributed" do
- expect(get("/u/User/contributed")).to route_to('users#contributed', username: 'User')
+ expect(get("/users/User/contributed")).to route_to('users#contributed', username: 'User')
end
it "to #snippets" do
- expect(get("/u/User/snippets")).to route_to('users#snippets', username: 'User')
+ expect(get("/users/User/snippets")).to route_to('users#snippets', username: 'User')
end
it "to #calendar" do
- expect(get("/u/User/calendar")).to route_to('users#calendar', username: 'User')
+ expect(get("/users/User/calendar")).to route_to('users#calendar', username: 'User')
end
it "to #calendar_activities" do
- expect(get("/u/User/calendar_activities")).to route_to('users#calendar_activities', username: 'User')
+ expect(get("/users/User/calendar_activities")).to route_to('users#calendar_activities', username: 'User')
end
end