summaryrefslogtreecommitdiff
path: root/spec/models/commit_spec.rb
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-04-29 12:02:56 +0000
committerValery Sizov <valery@gitlab.com>2015-04-29 12:02:56 +0000
commit3bbd2f55a299b31a702b7ae6aa2624e5116bc8e8 (patch)
treea12013f06b9392e899e0b965584318600bdc2cef /spec/models/commit_spec.rb
parent5f4de8f91e6e75e2d70e199156a813d9608a0fe3 (diff)
parent35192d047ea094ceb024b0595d8b0ce30a24a633 (diff)
downloadgitlab-ci-3bbd2f55a299b31a702b7ae6aa2624e5116bc8e8.tar.gz
Merge branch 'ci_skip_fix' into 'master'
Fix 'ci skip' tag https://dev.gitlab.org/gitlab/gitlab-ci/issues/206 See merge request !88
Diffstat (limited to 'spec/models/commit_spec.rb')
-rw-r--r--spec/models/commit_spec.rb14
1 files changed, 0 insertions, 14 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index af53df9..28cd0ef 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -54,20 +54,6 @@ describe Commit do
end
end
- describe :ci_skip? do
- let(:project) { FactoryGirl.create(:project) }
- let(:commit) { FactoryGirl.create(:commit, project: project) }
-
- it 'true if commit message contains [ci skip]' do
- commit.stub(:git_commit_message) { 'Small typo [ci skip]' }
- commit.ci_skip?.should == true
- end
-
- it 'false if commit message does not contain [ci skip]' do
- commit.ci_skip?.should == false
- end
- end
-
describe :project_recipients do
context 'always sending notification' do