Skip to content
Snippets Groups Projects
Commit a3a63eeb authored by Robert Speicher's avatar Robert Speicher
Browse files

Remove all instances to 'gitlabhq_x' seed repositories from specs and features

We now need only one seed repo! Also cleans up the seeding script.
parent a39cfb54
No related branches found
No related tags found
No related merge requests found
# create tmp dir if not exist
tmp_dir = File.join(Rails.root, "tmp")
Dir.mkdir(tmp_dir) unless File.exists?(tmp_dir)
# Create dir for test repo
repo_dir = File.join(Rails.root, "tmp", "tests")
Dir.mkdir(repo_dir) unless File.exists?(repo_dir)
`cp spec/seed_project.tar.gz tmp/tests/`
Dir.chdir(repo_dir)
`tar -xf seed_project.tar.gz`
3.times do |i|
`cp -r gitlabhq/ gitlabhq_#{i}/`
puts "Unpacked seed repo - tmp/tests/gitlabhq_#{i}"
require 'fileutils'
print "Unpacking seed repository..."
SEED_REPO = 'seed_project.tar.gz'
REPO_PATH = File.join(Rails.root, 'tmp', 'repositories')
# Make whatever directories we need to make
FileUtils.mkdir_p(REPO_PATH)
# Copy the archive to the repo path
FileUtils.cp(File.join(Rails.root, 'spec', SEED_REPO), REPO_PATH)
# chdir to the repo path
FileUtils.cd(REPO_PATH) do
# Extract the archive
`tar -xf #{SEED_REPO}`
# Remove the copy
FileUtils.rm(SEED_REPO)
end
puts ' done.'
Loading
Loading
@@ -106,13 +106,9 @@ Given /^I have assigned issues$/ do
end
 
Given /^I have authored merge requests$/ do
project1 = Factory :project,
:path => "gitlabhq_1",
:code => "gitlabhq_1"
project1 = Factory :project
 
project2 = Factory :project,
:path => "gitlabhq_2",
:code => "gitlabhq_2"
project2 = Factory :project
 
project1.add_access(@user, :read, :write)
project2.add_access(@user, :read, :write)
Loading
Loading
Loading
Loading
@@ -85,7 +85,7 @@ describe Project do
 
it "should return path to repo" do
project = Project.new(path: "somewhere")
project.path_to_repo.should == File.join(Rails.root, "tmp", "tests", "somewhere")
project.path_to_repo.should == File.join(Rails.root, "tmp", "repositories", "somewhere")
end
 
it "returns the full web URL for this repo" do
Loading
Loading
Loading
Loading
@@ -87,7 +87,7 @@ describe "Admin::Projects" do
visit new_admin_project_path
fill_in 'project_name', with: 'NewProject'
fill_in 'project_code', with: 'NPR'
fill_in 'project_path', with: 'gitlabhq_1'
fill_in 'project_path', with: 'newproject'
expect { click_button "Create project" }.to change { Project.count }.by(1)
@project = Project.last
end
Loading
Loading
Loading
Loading
@@ -6,13 +6,9 @@ describe "User Issues Dashboard" do
 
login_as :user
 
@project1 = Factory :project,
path: "gitlabhq_0",
code: "TEST1"
@project1 = Factory :project
 
@project2 = Factory :project,
path: "gitlabhq_1",
code: "TEST2"
@project2 = Factory :project
 
@project1.add_access(@user, :read, :write)
@project2.add_access(@user, :read, :write)
Loading
Loading
Loading
Loading
@@ -17,11 +17,11 @@ module StubbedRepository
if new_record? || path == 'newproject'
# There are a couple Project specs and features that expect the Project's
# path to be in the returned path, so let's patronize them.
File.join(Rails.root, 'tmp', 'tests', path)
File.join(Rails.root, 'tmp', 'repositories', path)
else
# For everything else, just give it the path to one of our real seeded
# repos.
File.join(Rails.root, 'tmp', 'tests', 'gitlabhq_0')
File.join(Rails.root, 'tmp', 'repositories', 'gitlabhq')
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment