def team_update
@admin_user = User.find(params[:id])
- UsersProject.user_bulk_import(
- @admin_user,
+ UsersProject.add_users_into_projects(
params[:project_ids],
+ [@admin_user.id],
params[:project_access]
)
end
def edit
- @last_commit = @project.last_commit_for(@ref, @path).sha
+ @last_commit = @project.repository.last_commit_for(@ref, @path).sha
end
def update
end
end
- # TODO: depreceate in future in favor of add_users_into_projects
- def bulk_import(project, user_ids, project_access)
- add_users_into_projects([project.id], user_ids, project_access)
- end
-
- # TODO: depreceate in future in favor of add_users_into_projects
- def user_bulk_import(user, project_ids, project_access)
- add_users_into_projects(project_ids, [user.id], project_access)
- end
-
def roles_hash
{
guest: GUEST,
%td
= link_to project_commits_path(@project, branch.name) do
%strong= branch.name
- - if branch.name == @project.root_ref
+ - if @project.root_ref?(branch.name)
%span.label default
%td
- if branch.commit
= link_to project_commits_path(@project, commit.head.name) do
%strong
= commit.head.name
- - if commit.head.name == @project.root_ref
+ - if @project.root_ref?(commit.head.name)
%span.label default
%td
include SharedPaths
And 'fill project form with valid data' do
- fill_in 'project_name', :with => 'NewProject'
+ fill_in 'project_name', with: 'Empty'
click_button "Create project"
end
Then 'I should see project page' do
current_path.should == project_path(Project.last)
- page.should have_content "NewProject"
+ page.should have_content "Empty"
end
And 'I should see empty project instuctions' do
page.should have_selector('ul.breadcrumb span.divider', count: 3)
page.should have_selector('ul.breadcrumb a', count: 4)
- find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path}\/commits\/master\z/)
+ find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z})
end
require 'spec_helper'
describe Commit do
- let(:commit) { create(:project).commit }
+ let(:commit) { create(:project).repository.commit }
describe CommitDecorator do
let(:decorator) { CommitDecorator.new(commit) }
+require "repository"
+require "project"
+
# Stubs out all Git repository access done by models so that specs can run
# against fake repositories without Grit complaining that they don't exist.
class Project
+ def repository
+ if path == "empty" || !path
+ nil
+ else
+ GitLabTestRepo.new(path_with_namespace)
+ end
+ end
+
def satellite
FakeSatellite.new
end
end
end
-class Repository
+class GitLabTestRepo < Repository
def repo
@repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
end