Merge branch 'master' into rename-reply-by-email

2 files changed, 24 insertions, 0 deletions

diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 5639b3db913..b8101ae77ec 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -38,6 +38,17 @@ describe GitlabMarkdownHelper do
         expect(markdown(actual)).to match(expected)
       end
     end
+
+    describe "override default project" do
+      let(:actual) { issue.to_reference }
+      let(:second_project) { create(:project) }
+      let(:second_issue) { create(:issue, project: second_project) }
+
+      it 'should link to the issue' do
+        expected = namespace_project_issue_path(second_project.namespace, second_project, second_issue)
+        expect(markdown(actual, project: second_project)).to match(expected)
+      end
+    end
   end
 
   describe '#link_to_gfm' do
diff --git a/spec/services/ci/create_commit_service_spec.rb b/spec/services/ci/create_commit_service_spec.rb
index 38d9943765a..84ab0a615dd 100644
--- a/spec/services/ci/create_commit_service_spec.rb
+++ b/spec/services/ci/create_commit_service_spec.rb
@@ -50,6 +50,19 @@ module Ci
         end
       end
 
+      it 'fails commits without .gitlab-ci.yml' do
+        result = service.execute(project,
+                                 ref: 'refs/heads/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 ci_yaml_file: config,
+                                 commits: [ { message: 'Message' } ]
+        )
+        expect(result).to be_persisted
+        expect(result.builds.any?).to be_falsey
+        expect(result.status).to eq('failed')
+      end
+
       describe :ci_skip? do
         it "skips builds creation if there is [ci skip] tag in commit message" do
           commits = [{ message: "some message[ci skip]" }]