summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-12-08 10:58:15 +0100
committerMarin Jankovski <maxlazio@gmail.com>2015-12-08 10:58:15 +0100
commit9bf51ae47d344c5939f275bb5ae429023456d30e (patch)
treec098a58629052bf4289cbc852153009e49fa7a2a
parentbf17609e2a4cc062a9bccd67e90dd6524f0389b2 (diff)
downloadgitlab-ce-serve_lfs_object.tar.gz
Fix specs caused by update of gitlab-test repo.serve_lfs_object
-rw-r--r--features/steps/project/source/browse_files.rb1
-rw-r--r--spec/controllers/projects/raw_controller_spec.rb2
-rw-r--r--spec/support/test_env.rb3
3 files changed, 4 insertions, 2 deletions
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 2edbca9b7fe..02d46e28237 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -306,6 +306,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
step 'I click on "files/lfs/lfs_object.iso" file in repo' do
+ visit namespace_project_tree_path(@project.namespace, @project, "lfs")
click_link 'files'
click_link "lfs"
click_link "lfs_object.iso"
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index 2329c246daa..cd42a592759 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -35,7 +35,7 @@ describe Projects::RawController do
end
context 'lfs object' do
- let(:id) { 'master/files/lfs/lfs_object.iso' }
+ let(:id) { 'be93687/files/lfs/lfs_object.iso' }
let!(:lfs_object) { create(:lfs_object, oid: '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897', size: '1575078') }
context 'when project has access' do
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 47c67475cd0..985bd141e69 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -12,7 +12,8 @@ module TestEnv
'fix' => '48f0be4',
'improve/awesome' => '5937ac0',
'markdown' => '0ed8c6c',
- 'master' => 'be93687',
+ 'lfs' => 'be93687',
+ 'master' => '5937ac0',
"'test'" => 'e56497b',
}