Download as
Browse Code »

Commit 31e3dc600a73f41c02ecc4f9ffa7007957204168

Authored by Dmitriy Zaporozhets
1 parent 80e79f33
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix routing specs

Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
app/views/hooks/_data_ex.html.erb
  Diff comments   View file @31e3dc6
... ... @@ -38,6 +38,6 @@
38 38 };
39 39 eos
40 40 %>
41   -<div class="white">
  41 +<div class="<%= user_color_scheme_class%>">
42 42 <%= raw Pygments::Lexer[:js].highlight(data_ex_str) %>
43 43 </div>
... ...
spec/routing/project_routing_spec.rb
  Diff comments   View file @31e3dc6
... ... @@ -191,17 +191,17 @@ describe ProtectedBranchesController, &quot;routing&quot; do
191 191 end
192 192 end
193 193  
194   -# switch_project_refs GET /:project_id/switch(.:format) refs#switch
195   -# logs_tree_project_ref GET /:project_id/:id/logs_tree(.:format) refs#logs_tree
196   -# logs_file_project_ref GET /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree
  194 +# switch_project_refs GET /:project_id/refs/switch(.:format) refs#switch
  195 +# logs_tree_project_ref GET /:project_id/refs/:id/logs_tree(.:format) refs#logs_tree
  196 +# logs_file_project_ref GET /:project_id/refs/:id/logs_tree/:path(.:format) refs#logs_tree
197 197 describe RefsController, "routing" do
198 198 it "to #switch" do
199   - get("/gitlabhq/switch").should route_to('refs#switch', project_id: 'gitlabhq')
  199 + get("/gitlabhq/refs/switch").should route_to('refs#switch', project_id: 'gitlabhq')
200 200 end
201 201  
202 202 it "to #logs_tree" do
203   - get("/gitlabhq/stable/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
204   - get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
  203 + get("/gitlabhq/refs/stable/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
  204 + get("/gitlabhq/refs/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
205 205 end
206 206 end
207 207  
... ...