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.
This commit is contained in:
parent
a39cfb5461
commit
a3a63eeb92
6 changed files with 28 additions and 28 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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…
Add table
Add a link
Reference in a new issue