1 files changed, 135 insertions, 143 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 48b58400a1e..879a63dd9f9 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -24,103 +24,107 @@
 #  import_status          :string(255)
 #  repository_size        :float            default(0.0)
 #  star_count             :integer          default(0), not null
+#  import_type            :string(255)
+#  import_source          :string(255)
+#  avatar                 :string(255)
 #
 
 require 'spec_helper'
 
 describe Project do
-  describe "Associations" do
-    it { should belong_to(:group) }
-    it { should belong_to(:namespace) }
-    it { should belong_to(:creator).class_name('User') }
-    it { should have_many(:users) }
-    it { should have_many(:events).dependent(:destroy) }
-    it { should have_many(:merge_requests).dependent(:destroy) }
-    it { should have_many(:issues).dependent(:destroy) }
-    it { should have_many(:milestones).dependent(:destroy) }
-    it { should have_many(:project_members).dependent(:destroy) }
-    it { should have_many(:notes).dependent(:destroy) }
-    it { should have_many(:snippets).class_name('ProjectSnippet').dependent(:destroy) }
-    it { should have_many(:deploy_keys_projects).dependent(:destroy) }
-    it { should have_many(:deploy_keys) }
-    it { should have_many(:hooks).dependent(:destroy) }
-    it { should have_many(:protected_branches).dependent(:destroy) }
-    it { should have_one(:forked_project_link).dependent(:destroy) }
-    it { should have_one(:slack_service).dependent(:destroy) }
-    it { should have_one(:pushover_service).dependent(:destroy) }
+  describe 'Associations' do
+    it { is_expected.to belong_to(:group) }
+    it { is_expected.to belong_to(:namespace) }
+    it { is_expected.to belong_to(:creator).class_name('User') }
+    it { is_expected.to have_many(:users) }
+    it { is_expected.to have_many(:events).dependent(:destroy) }
+    it { is_expected.to have_many(:merge_requests).dependent(:destroy) }
+    it { is_expected.to have_many(:issues).dependent(:destroy) }
+    it { is_expected.to have_many(:milestones).dependent(:destroy) }
+    it { is_expected.to have_many(:project_members).dependent(:destroy) }
+    it { is_expected.to have_many(:notes).dependent(:destroy) }
+    it { is_expected.to have_many(:snippets).class_name('ProjectSnippet').dependent(:destroy) }
+    it { is_expected.to have_many(:deploy_keys_projects).dependent(:destroy) }
+    it { is_expected.to have_many(:deploy_keys) }
+    it { is_expected.to have_many(:hooks).dependent(:destroy) }
+    it { is_expected.to have_many(:protected_branches).dependent(:destroy) }
+    it { is_expected.to have_one(:forked_project_link).dependent(:destroy) }
+    it { is_expected.to have_one(:slack_service).dependent(:destroy) }
+    it { is_expected.to have_one(:pushover_service).dependent(:destroy) }
+    it { is_expected.to have_one(:asana_service).dependent(:destroy) }
   end
 
-  describe "Mass assignment" do
+  describe 'Mass assignment' do
   end
 
-  describe "Validation" do
+  describe 'Validation' do
     let!(:project) { create(:project) }
 
-    it { should validate_presence_of(:name) }
-    it { should validate_uniqueness_of(:name).scoped_to(:namespace_id) }
-    it { should ensure_length_of(:name).is_within(0..255) }
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_uniqueness_of(:name).scoped_to(:namespace_id) }
+    it { is_expected.to ensure_length_of(:name).is_within(0..255) }
 
-    it { should validate_presence_of(:path) }
-    it { should validate_uniqueness_of(:path).scoped_to(:namespace_id) }
-    it { should ensure_length_of(:path).is_within(0..255) }
-    it { should ensure_length_of(:description).is_within(0..2000) }
-    it { should validate_presence_of(:creator) }
-    it { should ensure_length_of(:issues_tracker_id).is_within(0..255) }
-    it { should validate_presence_of(:namespace) }
+    it { is_expected.to validate_presence_of(:path) }
+    it { is_expected.to validate_uniqueness_of(:path).scoped_to(:namespace_id) }
+    it { is_expected.to ensure_length_of(:path).is_within(0..255) }
+    it { is_expected.to ensure_length_of(:description).is_within(0..2000) }
+    it { is_expected.to validate_presence_of(:creator) }
+    it { is_expected.to ensure_length_of(:issues_tracker_id).is_within(0..255) }
+    it { is_expected.to validate_presence_of(:namespace) }
 
-    it "should not allow new projects beyond user limits" do
+    it 'should not allow new projects beyond user limits' do
       project2 = build(:project)
-      project2.stub(:creator).and_return(double(can_create_project?: false, projects_limit: 0).as_null_object)
-      project2.should_not be_valid
-      project2.errors[:limit_reached].first.should match(/Your project limit is 0/)
+      allow(project2).to receive(:creator).and_return(double(can_create_project?: false, projects_limit: 0).as_null_object)
+      expect(project2).not_to be_valid
+      expect(project2.errors[:limit_reached].first).to match(/Your project limit is 0/)
     end
   end
 
-  describe "Respond to" do
-    it { should respond_to(:url_to_repo) }
-    it { should respond_to(:repo_exists?) }
-    it { should respond_to(:satellite) }
-    it { should respond_to(:update_merge_requests) }
-    it { should respond_to(:execute_hooks) }
-    it { should respond_to(:name_with_namespace) }
-    it { should respond_to(:owner) }
-    it { should respond_to(:path_with_namespace) }
+  describe 'Respond to' do
+    it { is_expected.to respond_to(:url_to_repo) }
+    it { is_expected.to respond_to(:repo_exists?) }
+    it { is_expected.to respond_to(:satellite) }
+    it { is_expected.to respond_to(:update_merge_requests) }
+    it { is_expected.to respond_to(:execute_hooks) }
+    it { is_expected.to respond_to(:name_with_namespace) }
+    it { is_expected.to respond_to(:owner) }
+    it { is_expected.to respond_to(:path_with_namespace) }
   end
 
-  it "should return valid url to repo" do
-    project = Project.new(path: "somewhere")
-    project.url_to_repo.should == Gitlab.config.gitlab_shell.ssh_path_prefix + "somewhere.git"
+  it 'should return valid url to repo' do
+    project = Project.new(path: 'somewhere')
+    expect(project.url_to_repo).to eq(Gitlab.config.gitlab_shell.ssh_path_prefix + 'somewhere.git')
   end
 
-  it "returns the full web URL for this repo" do
-    project = Project.new(path: "somewhere")
-    project.web_url.should == "#{Gitlab.config.gitlab.url}/somewhere"
+  it 'returns the full web URL for this repo' do
+    project = Project.new(path: 'somewhere')
+    expect(project.web_url).to eq("#{Gitlab.config.gitlab.url}/somewhere")
   end
 
-  it "returns the web URL without the protocol for this repo" do
-    project = Project.new(path: "somewhere")
-    project.web_url_without_protocol.should == "#{Gitlab.config.gitlab.url.split("://")[1]}/somewhere"
+  it 'returns the web URL without the protocol for this repo' do
+    project = Project.new(path: 'somewhere')
+    expect(project.web_url_without_protocol).to eq("#{Gitlab.config.gitlab.url.split('://')[1]}/somewhere")
   end
 
-  describe "last_activity methods" do
+  describe 'last_activity methods' do
     let(:project) { create(:project) }
     let(:last_event) { double(created_at: Time.now) }
 
-    describe "last_activity" do
-      it "should alias last_activity to last_event" do
+    describe 'last_activity' do
+      it 'should alias last_activity to last_event' do
         project.stub(last_event: last_event)
-        project.last_activity.should == last_event
+        expect(project.last_activity).to eq(last_event)
       end
     end
 
     describe 'last_activity_date' do
       it 'returns the creation date of the project\'s last event if present' do
         last_activity_event = create(:event, project: project)
-        project.last_activity_at.to_i.should == last_event.created_at.to_i
+        expect(project.last_activity_at.to_i).to eq(last_event.created_at.to_i)
       end
 
       it 'returns the project\'s last update date if it has no events' do
-        project.last_activity_date.should == project.updated_at
+        expect(project.last_activity_date).to eq(project.updated_at)
       end
     end
   end
@@ -132,73 +136,16 @@ describe Project do
     let(:prev_commit_id) { merge_request.commits.last.id }
     let(:commit_id) { merge_request.commits.first.id }
 
-    it "should close merge request if last commit from source branch was pushed to target branch" do
+    it 'should close merge request if last commit from source branch was pushed to target branch' do
       project.update_merge_requests(prev_commit_id, commit_id, "refs/heads/#{merge_request.target_branch}", key.user)
       merge_request.reload
-      merge_request.merged?.should be_true
+      expect(merge_request.merged?).to be_truthy
     end
 
-    it "should update merge request commits with new one if pushed to source branch" do
+    it 'should update merge request commits with new one if pushed to source branch' do
       project.update_merge_requests(prev_commit_id, commit_id, "refs/heads/#{merge_request.source_branch}", key.user)
       merge_request.reload
-      merge_request.last_commit.id.should == commit_id
-    end
-  end
-
-  describe 'comment merge requests with commits' do
-    before do
-      @user = create(:user)
-      group = create(:group)
-      group.add_owner(@user)
-
-      @project = create(:project, namespace: group)
-      @fork_project = Projects::ForkService.new(@project, @user).execute
-      @merge_request = create(:merge_request, source_project: @project,
-                              source_branch: 'master',
-                              target_branch: 'feature',
-                              target_project: @project)
-      @fork_merge_request = create(:merge_request, source_project: @fork_project,
-                                   source_branch: 'master',
-                                   target_branch: 'feature',
-                                   target_project: @project)
-
-      @commits = @merge_request.commits
-    end
-
-    context 'push to origin repo source branch' do
-      before do
-        @project.comment_mr_with_commits('master', @commits, @user)
-      end
-
-      it { @merge_request.notes.should_not be_empty }
-      it { @fork_merge_request.notes.should be_empty }
-    end
-
-    context 'push to origin repo target branch' do
-      before do
-        @project.comment_mr_with_commits('feature', @commits, @user)
-      end
-
-      it { @merge_request.notes.should be_empty }
-      it { @fork_merge_request.notes.should be_empty }
-    end
-
-    context 'push to fork repo source branch' do
-      before do
-        @fork_project.comment_mr_with_commits('master', @commits, @user)
-      end
-
-      it { @merge_request.notes.should be_empty }
-      it { @fork_merge_request.notes.should_not be_empty }
-    end
-
-    context 'push to fork repo target branch' do
-      before do
-        @fork_project.comment_mr_with_commits('feature', @commits, @user)
-      end
-
-      it { @merge_request.notes.should be_empty }
-      it { @fork_merge_request.notes.should be_empty }
+      expect(merge_request.last_commit.id).to eq(commit_id)
     end
   end
 
@@ -209,8 +156,8 @@ describe Project do
         @project = create(:project, name: 'gitlabhq', namespace: @group)
       end
 
-      it { Project.find_with_namespace('gitlab/gitlabhq').should == @project }
-      it { Project.find_with_namespace('gitlab-ci').should be_nil }
+      it { expect(Project.find_with_namespace('gitlab/gitlabhq')).to eq(@project) }
+      it { expect(Project.find_with_namespace('gitlab-ci')).to be_nil }
     end
   end
 
@@ -221,15 +168,15 @@ describe Project do
         @project = create(:project, name: 'gitlabhq', namespace: @group)
       end
 
-      it { @project.to_param.should == "gitlab/gitlabhq" }
+      it { expect(@project.to_param).to eq('gitlabhq') }
     end
   end
 
   describe :repository do
     let(:project) { create(:project) }
 
-    it "should return valid repo" do
-      project.repository.should be_kind_of(Repository)
+    it 'should return valid repo' do
+      expect(project.repository).to be_kind_of(Repository)
     end
   end
 
@@ -239,29 +186,29 @@ describe Project do
     let(:not_existed_issue) { create(:issue) }
     let(:ext_project) { create(:redmine_project) }
 
-    it "should be true or if used internal tracker and issue exists" do
-      project.issue_exists?(existed_issue.iid).should be_true
+    it 'should be true or if used internal tracker and issue exists' do
+      expect(project.issue_exists?(existed_issue.iid)).to be_truthy
     end
 
-    it "should be false or if used internal tracker and issue not exists" do
-      project.issue_exists?(not_existed_issue.iid).should be_false
+    it 'should be false or if used internal tracker and issue not exists' do
+      expect(project.issue_exists?(not_existed_issue.iid)).to be_falsey
     end
 
-    it "should always be true if used other tracker" do
-      ext_project.issue_exists?(rand(100)).should be_true
+    it 'should always be true if used other tracker' do
+      expect(ext_project.issue_exists?(rand(100))).to be_truthy
     end
   end
 
-  describe :used_default_issues_tracker? do
+  describe :default_issues_tracker? do
     let(:project) { create(:project) }
     let(:ext_project) { create(:redmine_project) }
 
     it "should be true if used internal tracker" do
-      project.used_default_issues_tracker?.should be_true
+      expect(project.default_issues_tracker?).to be_truthy
     end
 
     it "should be false if used other tracker" do
-      ext_project.used_default_issues_tracker?.should be_false
+      expect(ext_project.default_issues_tracker?).to be_falsey
     end
   end
 
@@ -269,20 +216,20 @@ describe Project do
     let(:project) { create(:project) }
     let(:ext_project) { create(:redmine_project) }
 
-    it "should be true for projects with external issues tracker if issues enabled" do
-      ext_project.can_have_issues_tracker_id?.should be_true
+    it 'should be true for projects with external issues tracker if issues enabled' do
+      expect(ext_project.can_have_issues_tracker_id?).to be_truthy
     end
 
-    it "should be false for projects with internal issue tracker if issues enabled" do
-      project.can_have_issues_tracker_id?.should be_false
+    it 'should be false for projects with internal issue tracker if issues enabled' do
+      expect(project.can_have_issues_tracker_id?).to be_falsey
     end
 
-    it "should be always false if issues disabled" do
+    it 'should be always false if issues disabled' do
       project.issues_enabled = false
       ext_project.issues_enabled = false
 
-      project.can_have_issues_tracker_id?.should be_false
-      ext_project.can_have_issues_tracker_id?.should be_false
+      expect(project.can_have_issues_tracker_id?).to be_falsey
+      expect(ext_project.can_have_issues_tracker_id?).to be_falsey
     end
   end
 
@@ -293,8 +240,8 @@ describe Project do
       project.protected_branches.create(name: 'master')
     end
 
-    it { project.open_branches.map(&:name).should include('feature') }
-    it { project.open_branches.map(&:name).should_not include('master') }
+    it { expect(project.open_branches.map(&:name)).to include('feature') }
+    it { expect(project.open_branches.map(&:name)).not_to include('master') }
   end
 
   describe '#star_count' do
@@ -365,4 +312,49 @@ describe Project do
       expect(project.star_count).to eq(0)
     end
   end
+
+  describe :avatar_type do
+    let(:project) { create(:project) }
+
+    it 'should be true if avatar is image' do
+      project.update_attribute(:avatar, 'uploads/avatar.png')
+      expect(project.avatar_type).to be_truthy
+    end
+
+    it 'should be false if avatar is html page' do
+      project.update_attribute(:avatar, 'uploads/avatar.html')
+      expect(project.avatar_type).to eq(['only images allowed'])
+    end
+  end
+
+  describe :avatar_url do
+    subject { project.avatar_url }
+
+    let(:project) { create(:project) }
+
+    context 'When avatar file is uploaded' do
+      before do
+        project.update_columns(avatar: 'uploads/avatar.png')
+        allow(project.avatar).to receive(:present?) { true }
+      end
+
+      let(:avatar_path) do
+        "/uploads/project/avatar/#{project.id}/uploads/avatar.png"
+      end
+
+      it { should eq "http://localhost#{avatar_path}" }
+    end
+
+    context 'When avatar file in git' do
+      before do
+        allow(project).to receive(:avatar_in_git) { true }
+      end
+
+      let(:avatar_path) do
+        "/#{project.namespace.name}/#{project.path}/avatar"
+      end
+
+      it { should eq "http://localhost#{avatar_path}" }
+    end
+  end
 end