Rspec fixes

Dmitriy Zaporozhets
1 parent dccd8b6e
Showing 22 changed files with 149 additions and 199 deletions Show diff stats
app/views/compare/_form.html.haml
features/steps/project/project_browse_commits.rb
lib/api/notes.rb
lib/api/projects.rb
spec/controllers/commit_controller_spec.rb
spec/controllers/commits_controller_spec.rb
spec/controllers/merge_requests_controller_spec.rb
spec/controllers/tree_controller_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb
spec/models/project_repository_spec.rb
spec/models/project_spec.rb
spec/models/repository_spec.rb
spec/requests/api/issues_spec.rb
spec/requests/api/merge_requests_spec.rb
spec/requests/api/milestones_spec.rb
spec/requests/api/notes_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/atom/issues_spec.rb
spec/requests/gitlab_flavored_markdown_spec.rb
spec/requests/projects_deploy_keys_spec.rb
@@ -28,7 +28,7 @@
 :javascript
   $(function() {
-    var availableTags = #{@project.ref_names.to_json};
+    var availableTags = #{@project.repository.ref_names.to_json};
     $("#from, #to").autocomplete({
       source: availableTags,
@@ -4,7 +4,7 @@ class ProjectBrowseCommits &lt; Spinach::FeatureSteps
   include SharedPaths
   Then 'I see project commits' do
-    commit = @project.commit
+    commit = @project.repository.commit
     page.should have_content(@project.name)
     page.should have_content(commit.message)
     page.should have_content(commit.id.to_s[0..5])
@@ -15,7 +15,7 @@ class ProjectBrowseCommits &lt; Spinach::FeatureSteps
   end
   Then 'I see commits atom feed' do
-    commit = CommitDecorator.decorate(@project.commit)
+    commit = CommitDecorator.decorate(@project.repository.commit)
     page.response_headers['Content-Type'].should have_content("application/atom+xml")
     page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
     page.body.should have_selector("author email", :text => commit.author_email)
@@ -13,7 +13,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id/notes
       get ":id/notes" do
-        @notes = user_project.common_notes
+        @notes = user_project.notes.common
         present paginate(@notes), with: Entities::Note
       end
@@ -25,7 +25,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id/notes/:note_id
       get ":id/notes/:note_id" do
-        @note = user_project.common_notes.find(params[:note_id])
+        @note = user_project.notes.common.find(params[:note_id])
         present @note, with: Entities::Note
       end
@@ -257,7 +257,7 @@ module Gitlab
         per_page = params[:per_page] || 20
         ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
-        commits = user_project.commits(ref, nil, per_page, page * per_page)
+        commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
         present CommitDecorator.decorate(commits), with: Entities::RepoCommit
       end
@@ -375,10 +375,10 @@ module Gitlab
         ref = params[:sha]
-        commit = user_project.commit ref
+        commit = user_project.repository.commit ref
         not_found! "Commit" unless commit
-        tree = Tree.new commit.tree, user_project, ref, params[:filepath]
+        tree = Tree.new commit.tree, ref, params[:filepath]
         not_found! "File" unless tree.try(:tree)
         content_type tree.mime_type
@@ -3,12 +3,12 @@ require &#39;spec_helper&#39;
 describe CommitController do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
-  let(:commit)  { project.last_commit_for("master") }
+  let(:commit)  { project.repository.last_commit_for("master") }
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
   end
   describe "#show" do
@@ -7,7 +7,7 @@ describe CommitsController do
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
   end
   describe "GET show" do
@@ -7,7 +7,7 @@ describe MergeRequestsController do
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
     MergeRequestsController.any_instance.stub(validates_merge_request: true)
   end
@@ -7,7 +7,7 @@ describe TreeController do
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
     project.stub(:branches).and_return(['master', 'foo/bar/baz'])
     project.stub(:tags).and_return(['v1.0.0', 'v2.0.0'])
@@ -4,7 +4,7 @@ describe GitlabMarkdownHelper do
   let!(:project) { create(:project) }
   let(:user)          { create(:user, username: 'gfm') }
-  let(:commit)        { CommitDecorator.decorate(project.commit) }
+  let(:commit)        { CommitDecorator.decorate(project.repository.commit) }
   let(:issue)         { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, project: project) }
   let(:snippet)       { create(:snippet, project: project) }
@@ -85,7 +85,7 @@ describe GitlabMarkdownHelper do
       let(:expected) { project_team_member_path(project, member) }
       before do
-        project.add_access(user, :admin)
+        project.team << [user, :master]
       end
       it "should link using a simple name" do
@@ -314,7 +314,7 @@ describe GitlabMarkdownHelper do
     end
     it "should handle references in lists" do
-      project.add_access(user, :admin)
+      project.team << [user, :master]
       actual = "\n* dark: ##{issue.id}\n* light by @#{member.user.username}"
@@ -1,159 +0,0 @@
-require 'spec_helper'
-
-describe Project, "Repository" do
-  let(:project) { create(:project) }
-
-  describe "#empty_repo?" do
-    it "should return true if the repo doesn't exist" do
-      project.stub(repo_exists?: false, has_commits?: true)
-      project.should be_empty_repo
-    end
-
-    it "should return true if the repo has commits" do
-      project.stub(repo_exists?: true, has_commits?: false)
-      project.should be_empty_repo
-    end
-
-    it "should return false if the repo exists and has commits" do
-      project.stub(repo_exists?: true, has_commits?: true)
-      project.should_not be_empty_repo
-    end
-  end
-
-  describe "#discover_default_branch" do
-    let(:master) { 'master' }
-    let(:stable) { 'stable' }
-
-    it "returns 'master' when master exists" do
-      project.should_receive(:branch_names).at_least(:once).and_return([stable, master])
-      project.discover_default_branch.should == 'master'
-    end
-
-    it "returns non-master when master exists but default branch is set to something else" do
-      project.default_branch = 'stable'
-      project.should_receive(:branch_names).at_least(:once).and_return([stable, master])
-      project.discover_default_branch.should == 'stable'
-    end
-
-    it "returns a non-master branch when only one exists" do
-      project.should_receive(:branch_names).at_least(:once).and_return([stable])
-      project.discover_default_branch.should == 'stable'
-    end
-
-    it "returns nil when no branch exists" do
-      project.should_receive(:branch_names).at_least(:once).and_return([])
-      project.discover_default_branch.should be_nil
-    end
-  end
-
-  describe "#root_ref" do
-    it "returns default_branch when set" do
-      project.default_branch = 'stable'
-      project.root_ref.should == 'stable'
-    end
-
-    it "returns 'master' when default_branch is nil" do
-      project.default_branch = nil
-      project.root_ref.should == 'master'
-    end
-  end
-
-  describe "#root_ref?" do
-    it "returns true when branch is root_ref" do
-      project.default_branch = 'stable'
-      project.root_ref?('stable').should be_true
-    end
-
-    it "returns false when branch is not root_ref" do
-      project.default_branch = nil
-      project.root_ref?('stable').should be_false
-    end
-  end
-
-  describe :repo do
-    it "should return valid repo" do
-      project.repo.should be_kind_of(Grit::Repo)
-    end
-
-    it "should return nil" do
-      lambda { Project.new(path: "invalid").repo }.should raise_error(Grit::NoSuchPathError)
-    end
-
-    it "should return nil" do
-      lambda { Project.new.repo }.should raise_error(TypeError)
-    end
-  end
-
-  describe :commit do
-    it "should return first head commit if without params" do
-      project.commit.id.should == project.repo.commits.first.id
-    end
-
-    it "should return valid commit" do
-      project.commit(ValidCommit::ID).should be_valid_commit
-    end
-
-    it "should return nil" do
-      project.commit("+123_4532530XYZ").should be_nil
-    end
-  end
-
-  describe :tree do
-    before do
-      @commit = project.commit(ValidCommit::ID)
-    end
-
-    it "should raise error w/o arguments" do
-      lambda { project.tree }.should raise_error
-    end
-
-    it "should return root tree for commit" do
-      tree = project.tree(@commit)
-      tree.contents.size.should == ValidCommit::FILES_COUNT
-      tree.contents.map(&:name).should == ValidCommit::FILES
-    end
-
-    it "should return root tree for commit with correct path" do
-      tree = project.tree(@commit, ValidCommit::C_FILE_PATH)
-      tree.contents.map(&:name).should == ValidCommit::C_FILES
-    end
-
-    it "should return root tree for commit with incorrect path" do
-      project.tree(@commit, "invalid_path").should be_nil
-    end
-  end
-
-  describe "fresh commits" do
-    let(:project) { create(:project) }
-
-    it { project.fresh_commits(3).count.should == 3 }
-    it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
-    it { project.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
-  end
-
-  describe "commits_between" do
-    let(:project) { create(:project) }
-
-    subject do
-      commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
-                                        "8470d70da67355c9c009e4401746b1d5410af2e3")
-      commits.map { |c| c.id }
-    end
-
-    it { should have(3).elements }
-    it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
-    it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
-  end
-
-  describe :valid_repo? do
-    it "should be valid repo" do
-      project = create(:project)
-      project.valid_repo?.should be_true
-    end
-
-    it "should be invalid repo" do
-      project = Project.new(name: "ok_name", path: "/INVALID_PATH/", path: "NEOK")
-      project.valid_repo?.should be_false
-    end
-  end
-end
@@ -84,7 +84,6 @@ describe Project do
     it { should respond_to(:satellite) }
     it { should respond_to(:update_repository) }
     it { should respond_to(:destroy_repository) }
-    it { should respond_to(:archive_repo) }
     # Authority Role
     it { should respond_to(:reset_access) }
@@ -94,14 +93,6 @@ describe Project do
     it { should respond_to(:dev_access_for?) }
     it { should respond_to(:master_access_for?) }
-    # Team Role
-    it { should respond_to(:team_member_by_name_or_email) }
-    it { should respond_to(:team_member_by_id) }
-    it { should respond_to(:add_user_to_team) }
-    it { should respond_to(:add_users_to_team) }
-    it { should respond_to(:add_user_id_to_team) }
-    it { should respond_to(:add_users_ids_to_team) }
-
     # Project Push Role
     it { should respond_to(:observe_push) }
     it { should respond_to(:update_merge_requests) }
@@ -253,4 +244,33 @@ describe Project do
       it { @project.to_param.should == "gitlab-ci" }
     end
   end
+
+  describe "#empty_repo?" do
+    let(:project) { create(:project) }
+
+    it "should return true if the repo doesn't exist" do
+      project.stub(repo_exists?: false, has_commits?: true)
+      project.should be_empty_repo
+    end
+
+    it "should return true if the repo has commits" do
+      project.stub(repo_exists?: true, has_commits?: false)
+      project.should be_empty_repo
+    end
+
+    it "should return false if the repo exists and has commits" do
+      project.stub(repo_exists?: true, has_commits?: true)
+      project.should_not be_empty_repo
+    end
+  end
+
+  describe :repository do
+    it "should return valid repo" do
+      project.repository.should be_kind_of(Repository)
+    end
+
+    it "should return nil" do
+      Project.new(path: "invalid").repository.should be_nil
+    end
+  end
 end
 describe Repository do
+  let(:project) { create(:project) }
+  let(:repository) { project.repository }
+
   describe "Respond to" do
+    subject { repository }
+
     it { should respond_to(:repo) }
     it { should respond_to(:tree) }
     it { should respond_to(:root_ref) }
@@ -11,4 +16,88 @@ describe Repository do
     it { should respond_to(:commits_since) }
     it { should respond_to(:commits_between) }
   end
+
+
+  describe "#discover_default_branch" do
+    let(:master) { 'master' }
+    let(:stable) { 'stable' }
+
+    it "returns 'master' when master exists" do
+      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
+      repository.discover_default_branch.should == 'master'
+    end
+
+    it "returns non-master when master exists but default branch is set to something else" do
+      repository.default_branch = 'stable'
+      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
+      repository.discover_default_branch.should == 'stable'
+    end
+
+    it "returns a non-master branch when only one exists" do
+      repository.should_receive(:branch_names).at_least(:once).and_return([stable])
+      repository.discover_default_branch.should == 'stable'
+    end
+
+    it "returns nil when no branch exists" do
+      repository.should_receive(:branch_names).at_least(:once).and_return([])
+      repository.discover_default_branch.should be_nil
+    end
+  end
+
+  describe :commit do
+    it "should return first head commit if without params" do
+      repository.commit.id.should == repository.repo.commits.first.id
+    end
+
+    it "should return valid commit" do
+      repository.commit(ValidCommit::ID).should be_valid_commit
+    end
+
+    it "should return nil" do
+      repository.commit("+123_4532530XYZ").should be_nil
+    end
+  end
+
+  describe :tree do
+    before do
+      @commit = repository.commit(ValidCommit::ID)
+    end
+
+    it "should raise error w/o arguments" do
+      lambda { repository.tree }.should raise_error
+    end
+
+    it "should return root tree for commit" do
+      tree = repository.tree(@commit)
+      tree.contents.size.should == ValidCommit::FILES_COUNT
+      tree.contents.map(&:name).should == ValidCommit::FILES
+    end
+
+    it "should return root tree for commit with correct path" do
+      tree = repository.tree(@commit, ValidCommit::C_FILE_PATH)
+      tree.contents.map(&:name).should == ValidCommit::C_FILES
+    end
+
+    it "should return root tree for commit with incorrect path" do
+      repository.tree(@commit, "invalid_path").should be_nil
+    end
+  end
+
+  describe "fresh commits" do
+    it { repository.fresh_commits(3).count.should == 3 }
+    it { repository.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
+    it { repository.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
+  end
+
+  describe "commits_between" do
+    subject do
+      commits = repository.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
+                                        "8470d70da67355c9c009e4401746b1d5410af2e3")
+      commits.map { |c| c.id }
+    end
+
+    it { should have(3).elements }
+    it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
+    it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
+  end
 end
@@ -6,7 +6,7 @@ describe Gitlab::API do
   let(:user) { create(:user) }
   let!(:project) { create(:project, namespace: user.namespace ) }
   let!(:issue) { create(:issue, author: user, assignee: user, project: project) }
-  before { project.add_access(user, :read) }
+  before { project.team << [user, :reporter] }
   describe "GET /issues" do
     context "when unauthenticated" do
@@ -6,7 +6,7 @@ describe Gitlab::API do
   let(:user) { create(:user ) }
   let!(:project) { create(:project, namespace: user.namespace ) }
   let!(:merge_request) { create(:merge_request, author: user, assignee: user, project: project, title: "Test") }
-  before { project.add_access(user, :read) }
+  before { project.team << [user, :reporters] }
   describe "GET /projects/:id/merge_requests" do
     context "when unauthenticated" do
@@ -7,7 +7,7 @@ describe Gitlab::API do
   let!(:project) { create(:project, namespace: user.namespace ) }
   let!(:milestone) { create(:milestone, project: project) }
-  before { project.add_access(user, :read) }
+  before { project.team << [user, :developer] }
   describe "GET /projects/:id/milestones" do
     it "should return project milestones" do
@@ -10,7 +10,7 @@ describe Gitlab::API do
   let!(:issue_note) { create(:note, noteable: issue, project: project, author: user) }
   let!(:snippet_note) { create(:note, noteable: snippet, project: project, author: user) }
   let!(:wall_note) { create(:note, project: project, author: user) }
-  before { project.add_access(user, :read) }
+  before { project.team << [user, :reporter] }
   describe "GET /projects/:id/notes" do
     context "when unauthenticated" do
@@ -11,7 +11,7 @@ describe Gitlab::API do
   let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') }
   let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
   let!(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
-  before { project.add_access(user, :read) }
+  before { project.team << [user, :reporter] }
   describe "GET /projects" do
     context "when unauthenticated" do
@@ -226,14 +226,14 @@ describe Gitlab::API do
   describe "GET /projects/:id/repository/commits" do
     context "authorized user" do
-      before { project.add_access(user2, :read) }
+      before { project.team << [user2, :reporter] }
       it "should return project commits" do
         get api("/projects/#{project.id}/repository/commits", user)
         response.status.should == 200
         json_response.should be_an Array
-        json_response.first['id'].should == project.commit.id
+        json_response.first['id'].should == project.repository.commit.id
       end
     end
@@ -6,7 +6,7 @@ describe &quot;Issues Feed&quot; do
     let!(:project)  { create(:project, namespace: user.namespace) }
     let!(:issue)    { create(:issue, author: user, project: project) }
-    before { project.add_access(user, :read, :write) }
+    before { project.team << [user, :developer] }
     context "when authenticated" do
       it "should render atom feed" do
@@ -6,7 +6,7 @@ describe &quot;Gitlab Flavored Markdown&quot; do
   let(:merge_request) { create(:merge_request, project: project) }
   let(:fred) do
       u = create(:user, name: "fred")
-      project.add_access(u, :admin)
+      project.team << [u, :master]
       u
   end
@@ -33,11 +33,11 @@ describe &quot;Gitlab Flavored Markdown&quot; do
     project.repo.gc_auto
   end
-  let(:commit) { project.commits(@branch_name).first }
+  let(:commit) { project.repository.commits(@branch_name).first }
   before do
     login_as :user
-    project.add_access(@user, :read, :write)
+    project.team << [@user, :developer]
   end
   describe "for commits" do
@@ -5,7 +5,7 @@ describe &quot;Projects&quot;, &quot;DeployKeys&quot; do
   before do
     login_as :user
-    project.add_access(@user, :read, :write, :admin)
+    project.team << [@user, :master]
   end
   describe "GET /keys" do
@@ -4,7 +4,7 @@ describe &quot;Search&quot; do
   before do
     login_as :user
     @project = create(:project)
-    @project.add_access(@user, :read)
+    @project.team << [@user, :reporter]
     visit search_path
     fill_in "search", with: @project.name[0..3]
     click_button "Search"
@@ -5,7 +5,7 @@ describe &quot;Snippets&quot; do
   before do
     login_as :user
-    project.add_access(@user, :read, :write)
+    project.team << [@user, :developer]
   end
   describe "GET /snippets" do
@@ -26,7 +26,7 @@ describe &quot;Snippets&quot; do
       before do
         # admin access to remove snippet
         @user.users_projects.destroy_all
-        project.add_access(@user, :read, :write, :admin)
+        project.team << [@user, :master]
         visit edit_project_snippet_path(project, @snippet)
       end
	@@ -28,7 +28,7 @@		@@ -28,7 +28,7 @@
28		28
29	:javascript	29	:javascript
30	$(function() {	30	$(function() {
31	- var availableTags = #{@project.ref_names.to_json};	31	+ var availableTags = #{@project.repository.ref_names.to_json};
32		32
33	$("#from, #to").autocomplete({	33	$("#from, #to").autocomplete({
34	source: availableTags,	34	source: availableTags,
	@@ -4,7 +4,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps		@@ -4,7 +4,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
4	include SharedPaths	4	include SharedPaths
5		5
6	Then 'I see project commits' do	6	Then 'I see project commits' do
7	- commit = @project.commit	7	+ commit = @project.repository.commit
8	page.should have_content(@project.name)	8	page.should have_content(@project.name)
9	page.should have_content(commit.message)	9	page.should have_content(commit.message)
10	page.should have_content(commit.id.to_s[0..5])	10	page.should have_content(commit.id.to_s[0..5])
	@@ -15,7 +15,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps		@@ -15,7 +15,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
15	end	15	end
16		16
17	Then 'I see commits atom feed' do	17	Then 'I see commits atom feed' do
18	- commit = CommitDecorator.decorate(@project.commit)	18	+ commit = CommitDecorator.decorate(@project.repository.commit)
19	page.response_headers['Content-Type'].should have_content("application/atom+xml")	19	page.response_headers['Content-Type'].should have_content("application/atom+xml")
20	page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")	20	page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
21	page.body.should have_selector("author email", :text => commit.author_email)	21	page.body.should have_selector("author email", :text => commit.author_email)
	@@ -13,7 +13,7 @@ module Gitlab		@@ -13,7 +13,7 @@ module Gitlab
13	# Example Request:	13	# Example Request:
14	# GET /projects/:id/notes	14	# GET /projects/:id/notes
15	get ":id/notes" do	15	get ":id/notes" do
16	- @notes = user_project.common_notes	16	+ @notes = user_project.notes.common
17	present paginate(@notes), with: Entities::Note	17	present paginate(@notes), with: Entities::Note
18	end	18	end
19		19
	@@ -25,7 +25,7 @@ module Gitlab		@@ -25,7 +25,7 @@ module Gitlab
25	# Example Request:	25	# Example Request:
26	# GET /projects/:id/notes/:note_id	26	# GET /projects/:id/notes/:note_id
27	get ":id/notes/:note_id" do	27	get ":id/notes/:note_id" do
28	- @note = user_project.common_notes.find(params[:note_id])	28	+ @note = user_project.notes.common.find(params[:note_id])
29	present @note, with: Entities::Note	29	present @note, with: Entities::Note
30	end	30	end
31		31
	@@ -257,7 +257,7 @@ module Gitlab		@@ -257,7 +257,7 @@ module Gitlab
257	per_page = params[:per_page] \|\| 20	257	per_page = params[:per_page] \|\| 20
258	ref = params[:ref_name] \|\| user_project.try(:default_branch) \|\| 'master'	258	ref = params[:ref_name] \|\| user_project.try(:default_branch) \|\| 'master'
259		259
260	- commits = user_project.commits(ref, nil, per_page, page * per_page)	260	+ commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
261	present CommitDecorator.decorate(commits), with: Entities::RepoCommit	261	present CommitDecorator.decorate(commits), with: Entities::RepoCommit
262	end	262	end
263		263
	@@ -375,10 +375,10 @@ module Gitlab		@@ -375,10 +375,10 @@ module Gitlab
375		375
376	ref = params[:sha]	376	ref = params[:sha]
377		377
378	- commit = user_project.commit ref	378	+ commit = user_project.repository.commit ref
379	not_found! "Commit" unless commit	379	not_found! "Commit" unless commit
380		380
381	- tree = Tree.new commit.tree, user_project, ref, params[:filepath]	381	+ tree = Tree.new commit.tree, ref, params[:filepath]
382	not_found! "File" unless tree.try(:tree)	382	not_found! "File" unless tree.try(:tree)
383		383
384	content_type tree.mime_type	384	content_type tree.mime_type
	@@ -3,12 +3,12 @@ require 'spec_helper'		@@ -3,12 +3,12 @@ require 'spec_helper'
3	describe CommitController do	3	describe CommitController do
4	let(:project) { create(:project) }	4	let(:project) { create(:project) }
5	let(:user) { create(:user) }	5	let(:user) { create(:user) }
6	- let(:commit) { project.last_commit_for("master") }	6	+ let(:commit) { project.repository.last_commit_for("master") }
7		7
8	before do	8	before do
9	sign_in(user)	9	sign_in(user)
10		10
11	- project.add_access(user, :read, :admin)	11	+ project.team << [user, :master]
12	end	12	end
13		13
14	describe "#show" do	14	describe "#show" do
	@@ -7,7 +7,7 @@ describe CommitsController do		@@ -7,7 +7,7 @@ describe CommitsController do
7	before do	7	before do
8	sign_in(user)	8	sign_in(user)
9		9
10	- project.add_access(user, :read, :admin)	10	+ project.team << [user, :master]
11	end	11	end
12		12
13	describe "GET show" do	13	describe "GET show" do
	@@ -7,7 +7,7 @@ describe MergeRequestsController do		@@ -7,7 +7,7 @@ describe MergeRequestsController do
7		7
8	before do	8	before do
9	sign_in(user)	9	sign_in(user)
10	- project.add_access(user, :read, :admin)	10	+ project.team << [user, :master]
11	MergeRequestsController.any_instance.stub(validates_merge_request: true)	11	MergeRequestsController.any_instance.stub(validates_merge_request: true)
12	end	12	end
13		13
	@@ -7,7 +7,7 @@ describe TreeController do		@@ -7,7 +7,7 @@ describe TreeController do
7	before do	7	before do
8	sign_in(user)	8	sign_in(user)
9		9
10	- project.add_access(user, :read, :admin)	10	+ project.team << [user, :master]
11		11
12	project.stub(:branches).and_return(['master', 'foo/bar/baz'])	12	project.stub(:branches).and_return(['master', 'foo/bar/baz'])
13	project.stub(:tags).and_return(['v1.0.0', 'v2.0.0'])	13	project.stub(:tags).and_return(['v1.0.0', 'v2.0.0'])
	@@ -4,7 +4,7 @@ describe GitlabMarkdownHelper do		@@ -4,7 +4,7 @@ describe GitlabMarkdownHelper do
4	let!(:project) { create(:project) }	4	let!(:project) { create(:project) }
5		5
6	let(:user) { create(:user, username: 'gfm') }	6	let(:user) { create(:user, username: 'gfm') }
7	- let(:commit) { CommitDecorator.decorate(project.commit) }	7	+ let(:commit) { CommitDecorator.decorate(project.repository.commit) }
8	let(:issue) { create(:issue, project: project) }	8	let(:issue) { create(:issue, project: project) }
9	let(:merge_request) { create(:merge_request, project: project) }	9	let(:merge_request) { create(:merge_request, project: project) }
10	let(:snippet) { create(:snippet, project: project) }	10	let(:snippet) { create(:snippet, project: project) }
	@@ -85,7 +85,7 @@ describe GitlabMarkdownHelper do		@@ -85,7 +85,7 @@ describe GitlabMarkdownHelper do
85	let(:expected) { project_team_member_path(project, member) }	85	let(:expected) { project_team_member_path(project, member) }
86		86
87	before do	87	before do
88	- project.add_access(user, :admin)	88	+ project.team << [user, :master]
89	end	89	end
90		90
91	it "should link using a simple name" do	91	it "should link using a simple name" do
	@@ -314,7 +314,7 @@ describe GitlabMarkdownHelper do		@@ -314,7 +314,7 @@ describe GitlabMarkdownHelper do
314	end	314	end
315		315
316	it "should handle references in lists" do	316	it "should handle references in lists" do
317	- project.add_access(user, :admin)	317	+ project.team << [user, :master]
318		318
319	actual = "\n* dark: ##{issue.id}\n* light by @#{member.user.username}"	319	actual = "\n* dark: ##{issue.id}\n* light by @#{member.user.username}"
320		320
	@@ -1,159 +0,0 @@	@@ -1,159 +0,0 @@
1	-require 'spec_helper'
2	-
3	-describe Project, "Repository" do
4	- let(:project) { create(:project) }
5	-
6	- describe "#empty_repo?" do
7	- it "should return true if the repo doesn't exist" do
8	- project.stub(repo_exists?: false, has_commits?: true)
9	- project.should be_empty_repo
10	- end
11	-
12	- it "should return true if the repo has commits" do
13	- project.stub(repo_exists?: true, has_commits?: false)
14	- project.should be_empty_repo
15	- end
16	-
17	- it "should return false if the repo exists and has commits" do
18	- project.stub(repo_exists?: true, has_commits?: true)
19	- project.should_not be_empty_repo
20	- end
21	- end
22	-
23	- describe "#discover_default_branch" do
24	- let(:master) { 'master' }
25	- let(:stable) { 'stable' }
26	-
27	- it "returns 'master' when master exists" do
28	- project.should_receive(:branch_names).at_least(:once).and_return([stable, master])
29	- project.discover_default_branch.should == 'master'
30	- end
31	-
32	- it "returns non-master when master exists but default branch is set to something else" do
33	- project.default_branch = 'stable'
34	- project.should_receive(:branch_names).at_least(:once).and_return([stable, master])
35	- project.discover_default_branch.should == 'stable'
36	- end
37	-
38	- it "returns a non-master branch when only one exists" do
39	- project.should_receive(:branch_names).at_least(:once).and_return([stable])
40	- project.discover_default_branch.should == 'stable'
41	- end
42	-
43	- it "returns nil when no branch exists" do
44	- project.should_receive(:branch_names).at_least(:once).and_return([])
45	- project.discover_default_branch.should be_nil
46	- end
47	- end
48	-
49	- describe "#root_ref" do
50	- it "returns default_branch when set" do
51	- project.default_branch = 'stable'
52	- project.root_ref.should == 'stable'
53	- end
54	-
55	- it "returns 'master' when default_branch is nil" do
56	- project.default_branch = nil
57	- project.root_ref.should == 'master'
58	- end
59	- end
60	-
61	- describe "#root_ref?" do
62	- it "returns true when branch is root_ref" do
63	- project.default_branch = 'stable'
64	- project.root_ref?('stable').should be_true
65	- end
66	-
67	- it "returns false when branch is not root_ref" do
68	- project.default_branch = nil
69	- project.root_ref?('stable').should be_false
70	- end
71	- end
72	-
73	- describe :repo do
74	- it "should return valid repo" do
75	- project.repo.should be_kind_of(Grit::Repo)
76	- end
77	-
78	- it "should return nil" do
79	- lambda { Project.new(path: "invalid").repo }.should raise_error(Grit::NoSuchPathError)
80	- end
81	-
82	- it "should return nil" do
83	- lambda { Project.new.repo }.should raise_error(TypeError)
84	- end
85	- end
86	-
87	- describe :commit do
88	- it "should return first head commit if without params" do
89	- project.commit.id.should == project.repo.commits.first.id
90	- end
91	-
92	- it "should return valid commit" do
93	- project.commit(ValidCommit::ID).should be_valid_commit
94	- end
95	-
96	- it "should return nil" do
97	- project.commit("+123_4532530XYZ").should be_nil
98	- end
99	- end
100	-
101	- describe :tree do
102	- before do
103	- @commit = project.commit(ValidCommit::ID)
104	- end
105	-
106	- it "should raise error w/o arguments" do
107	- lambda { project.tree }.should raise_error
108	- end
109	-
110	- it "should return root tree for commit" do
111	- tree = project.tree(@commit)
112	- tree.contents.size.should == ValidCommit::FILES_COUNT
113	- tree.contents.map(&:name).should == ValidCommit::FILES
114	- end
115	-
116	- it "should return root tree for commit with correct path" do
117	- tree = project.tree(@commit, ValidCommit::C_FILE_PATH)
118	- tree.contents.map(&:name).should == ValidCommit::C_FILES
119	- end
120	-
121	- it "should return root tree for commit with incorrect path" do
122	- project.tree(@commit, "invalid_path").should be_nil
123	- end
124	- end
125	-
126	- describe "fresh commits" do
127	- let(:project) { create(:project) }
128	-
129	- it { project.fresh_commits(3).count.should == 3 }
130	- it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
131	- it { project.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
132	- end
133	-
134	- describe "commits_between" do
135	- let(:project) { create(:project) }
136	-
137	- subject do
138	- commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
139	- "8470d70da67355c9c009e4401746b1d5410af2e3")
140	- commits.map { \|c\| c.id }
141	- end
142	-
143	- it { should have(3).elements }
144	- it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
145	- it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
146	- end
147	-
148	- describe :valid_repo? do
149	- it "should be valid repo" do
150	- project = create(:project)
151	- project.valid_repo?.should be_true
152	- end
153	-
154	- it "should be invalid repo" do
155	- project = Project.new(name: "ok_name", path: "/INVALID_PATH/", path: "NEOK")
156	- project.valid_repo?.should be_false
157	- end
158	- end
159	-end