summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--features/steps/project/source/browse_files.rb2
-rw-r--r--spec/routing/project_routing_spec.rb14
2 files changed, 6 insertions, 10 deletions
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 805e6ff0eac..1caad73654b 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -78,7 +78,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
step 'I click link "Diff"' do
- click_link 'Diff'
+ click_link 'Preview changes'
end
step 'I click on "Commit Changes"' do
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 8191d1fb9c4..e36b266a1ff 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -430,21 +430,17 @@ describe Projects::TreeController, 'routing' do
end
end
-describe Projects::EditTreeController, 'routing' do
- it 'to #show' do
+describe Projects::BlobController, 'routing' do
+ it 'to #edit' do
get('/gitlab/gitlabhq/edit/master/app/models/project.rb').should(
- route_to('projects/edit_tree#show',
+ route_to('projects/blob#edit',
project_id: 'gitlab/gitlabhq',
id: 'master/app/models/project.rb'))
- get('/gitlab/gitlabhq/edit/master/app/models/project.rb/preview').should(
- route_to('projects/edit_tree#show',
- project_id: 'gitlab/gitlabhq',
- id: 'master/app/models/project.rb/preview'))
end
it 'to #preview' do
- post('/gitlab/gitlabhq/edit/master/app/models/project.rb/preview').should(
- route_to('projects/edit_tree#preview',
+ post('/gitlab/gitlabhq/preview/master/app/models/project.rb').should(
+ route_to('projects/blob#preview',
project_id: 'gitlab/gitlabhq',
id: 'master/app/models/project.rb'))
end