From 37ff9d88ec0a9717900e05c26156f11f0e5ba5a5 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 9 Jun 2013 15:00:42 +0200 Subject: Routing fix Commit-List: switch to branch with # in name --- spec/routing/project_routing_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec/routing') diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index 94f9480a4d0..fab7ea25a0e 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -201,7 +201,9 @@ describe RefsController, "routing" do it "to #logs_tree" do get("/gitlabhq/refs/stable/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable') + get("/gitlabhq/refs/feature%2345/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45') get("/gitlabhq/refs/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz') + get("/gitlabhq/refs/feature%2345/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45', path: 'foo/bar/baz') get("/gitlab/gitlabhq/refs/stable/logs_tree/files.scss").should route_to('refs#logs_tree', project_id: 'gitlab/gitlabhq', id: 'stable', path: 'files.scss') end end -- cgit v1.2.1 From c830bab79a86d2397d1bd66c911e549377e396b4 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 9 Jun 2013 23:47:55 +0200 Subject: Commit List and Tree allow also + in branch name --- spec/routing/project_routing_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec/routing') diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index fab7ea25a0e..f93d8dc479a 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -202,8 +202,10 @@ describe RefsController, "routing" do it "to #logs_tree" do get("/gitlabhq/refs/stable/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable') get("/gitlabhq/refs/feature%2345/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45') + get("/gitlabhq/refs/feature%2B45/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature+45') get("/gitlabhq/refs/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz') get("/gitlabhq/refs/feature%2345/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45', path: 'foo/bar/baz') + get("/gitlabhq/refs/feature%2B45/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature+45', path: 'foo/bar/baz') get("/gitlab/gitlabhq/refs/stable/logs_tree/files.scss").should route_to('refs#logs_tree', project_id: 'gitlab/gitlabhq', id: 'stable', path: 'files.scss') end end -- cgit v1.2.1