summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-02-11 11:29:57 +0200
committerValery Sizov <vsv2711@gmail.com>2015-02-11 11:29:57 +0200
commit5ef40a48fa87d7060119ea9912f9ea00b22c05e8 (patch)
treef89264c4c2ae48d23e402056e558d7c0d57438dd /spec/models
parente5cfac699a00b343d5368fde753a044d3abd411e (diff)
downloadgitlab-ci-5ef40a48fa87d7060119ea9912f9ea00b22c05e8.tar.gz
Fix skip_refs parameter, glob pattern implementationbranch_wildcard_fix
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/project_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 55740f3..4f7f299 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -134,7 +134,7 @@ describe Project do
end
describe "#skip_ref?" do
- let(:project) { FactoryGirl.create(:project, skip_refs: "master, develop, feature/.*, hotfix/*") }
+ let(:project) { FactoryGirl.create(:project, skip_refs: "master, develop, feature/*") }
it 'returns true when item is not in list' do
expect(project.skip_ref?('someotherstring')).to eq false
@@ -144,9 +144,8 @@ describe Project do
expect(project.skip_ref?('master')).to eq true
end
- it 'accepts regex values' do
+ it 'accepts glob pattern syntax' do
expect(project.skip_ref?('feature/some_feature')).to eq true
- expect(project.skip_ref?('feature/ssh_fix')).to eq true
end
end
end