Commit c661fbda authored by Douwe Maan's avatar Douwe Maan

Fix specs

parent c6bbc4fb
...@@ -193,7 +193,7 @@ describe Gitlab::Checks::ChangeAccess, lib: true do ...@@ -193,7 +193,7 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
white_listed.each do |file_path| white_listed.each do |file_path|
old_rev = 'be93687618e4b132087f430a4d8fc3a609c9b77c' old_rev = 'be93687618e4b132087f430a4d8fc3a609c9b77c'
old_rev = new_rev if new_rev old_rev = new_rev if new_rev
new_rev = project.repository.commit_file(user, file_path, "commit #{file_path}", message: "commit #{file_path}", branch_name: "master", update: false) new_rev = project.repository.create_file(user, file_path, "commit #{file_path}", message: "commit #{file_path}", branch_name: "master")
allow(project.repository).to receive(:new_commits).and_return( allow(project.repository).to receive(:new_commits).and_return(
project.repository.commits_between(old_rev, new_rev) project.repository.commits_between(old_rev, new_rev)
...@@ -216,7 +216,7 @@ describe Gitlab::Checks::ChangeAccess, lib: true do ...@@ -216,7 +216,7 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
black_listed.each do |file_path| black_listed.each do |file_path|
old_rev = 'be93687618e4b132087f430a4d8fc3a609c9b77c' old_rev = 'be93687618e4b132087f430a4d8fc3a609c9b77c'
old_rev = new_rev if new_rev old_rev = new_rev if new_rev
new_rev = project.repository.commit_file(user, file_path, "commit #{file_path}", message: "commit #{file_path}", branch_name: "master", update: false) new_rev = project.repository.create_file(user, file_path, "commit #{file_path}", message: "commit #{file_path}", branch_name: "master")
allow(project.repository).to receive(:new_commits).and_return( allow(project.repository).to receive(:new_commits).and_return(
project.repository.commits_between(old_rev, new_rev) project.repository.commits_between(old_rev, new_rev)
......
...@@ -557,13 +557,12 @@ describe Gitlab::Elastic::SearchResults, lib: true do ...@@ -557,13 +557,12 @@ describe Gitlab::Elastic::SearchResults, lib: true do
context 'Commits' do context 'Commits' do
it 'finds right set of commits' do it 'finds right set of commits' do
[internal_project, private_project1, private_project2, public_project].each do |project| [internal_project, private_project1, private_project2, public_project].each do |project|
project.repository.commit_file( project.repository.create_file(
user, user,
'test-file', 'test-file',
'search test', 'search test',
message: 'search test', message: 'search test',
branch_name: 'master', branch_name: 'master'
update: false
) )
project.repository.index_commits project.repository.index_commits
...@@ -590,13 +589,12 @@ describe Gitlab::Elastic::SearchResults, lib: true do ...@@ -590,13 +589,12 @@ describe Gitlab::Elastic::SearchResults, lib: true do
context 'Blobs' do context 'Blobs' do
it 'finds right set of blobs' do it 'finds right set of blobs' do
[internal_project, private_project1, private_project2, public_project].each do |project| [internal_project, private_project1, private_project2, public_project].each do |project|
project.repository.commit_file( project.repository.create_file(
user, user,
'test-file', 'test-file',
'tesla', 'tesla',
message: 'search test', message: 'search test',
branch_name: 'master', branch_name: 'master'
update: false
) )
project.repository.index_blobs project.repository.index_blobs
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment