Merge branch '41264-gitlab-projects-spec-failures' into 'master'
Fix spec failures in spec/lib/gitlab/git/gitlab_projects_spec.rb Closes #41264 See merge request gitlab-org/gitlab-ce!16015
This commit is contained in:
commit
5b880f0d36
|
@ -2,15 +2,15 @@ require 'spec_helper'
|
|||
|
||||
feature 'project owner sees a link to create a license file in empty project', :js do
|
||||
let(:project_master) { create(:user) }
|
||||
let(:project) { create(:project) }
|
||||
let(:project) { create(:project_empty_repo) }
|
||||
|
||||
background do
|
||||
project.team << [project_master, :master]
|
||||
project.add_master(project_master)
|
||||
sign_in(project_master)
|
||||
end
|
||||
|
||||
scenario 'project master creates a license file from a template' do
|
||||
visit project_path(project)
|
||||
click_link 'Create empty bare repository'
|
||||
click_on 'LICENSE'
|
||||
expect(page).to have_content('New file')
|
||||
|
||||
|
@ -26,8 +26,6 @@ feature 'project owner sees a link to create a license file in empty project', :
|
|||
expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
|
||||
|
||||
fill_in :commit_message, with: 'Add a LICENSE file', visible: true
|
||||
# Remove pre-receive hook so we can push without auth
|
||||
FileUtils.rm_f(File.join(project.repository.path, 'hooks', 'pre-receive'))
|
||||
click_button 'Commit changes'
|
||||
|
||||
expect(current_path).to eq(
|
||||
|
|
|
@ -4,18 +4,17 @@ feature 'Master views tags' do
|
|||
let(:user) { create(:user) }
|
||||
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
project.add_master(user)
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
context 'when project has no tags' do
|
||||
let(:project) { create(:project_empty_repo) }
|
||||
|
||||
before do
|
||||
visit project_path(project)
|
||||
click_on 'README'
|
||||
fill_in :commit_message, with: 'Add a README file', visible: true
|
||||
# Remove pre-receive hook so we can push without auth
|
||||
FileUtils.rm_f(File.join(project.repository.path, 'hooks', 'pre-receive'))
|
||||
click_button 'Commit changes'
|
||||
visit project_tags_path(project)
|
||||
end
|
||||
|
|
|
@ -41,7 +41,8 @@ describe Gitlab::Git::GitlabProjects do
|
|||
end
|
||||
|
||||
it "fails if the source path doesn't exist" do
|
||||
expect(logger).to receive(:error).with("mv-project failed: source path <#{tmp_repos_path}/bad-src.git> does not exist.")
|
||||
expected_source_path = File.join(tmp_repos_path, 'bad-src.git')
|
||||
expect(logger).to receive(:error).with("mv-project failed: source path <#{expected_source_path}> does not exist.")
|
||||
|
||||
result = build_gitlab_projects(tmp_repos_path, 'bad-src.git').mv_project('repo.git')
|
||||
expect(result).to be_falsy
|
||||
|
@ -50,7 +51,8 @@ describe Gitlab::Git::GitlabProjects do
|
|||
it 'fails if the destination path already exists' do
|
||||
FileUtils.mkdir_p(File.join(tmp_repos_path, 'already-exists.git'))
|
||||
|
||||
message = "mv-project failed: destination path <#{tmp_repos_path}/already-exists.git> already exists."
|
||||
expected_distination_path = File.join(tmp_repos_path, 'already-exists.git')
|
||||
message = "mv-project failed: destination path <#{expected_distination_path}> already exists."
|
||||
expect(logger).to receive(:error).with(message)
|
||||
|
||||
expect(gl_projects.mv_project('already-exists.git')).to be_falsy
|
||||
|
|
Loading…
Reference in New Issue