diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2016-04-26 11:08:56 +0200 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2016-04-26 11:08:56 +0200 |
commit | 2f5394f5d640944a4efac9d89fcbdbcf79803f01 (patch) | |
tree | dbe66c08a331a71cc0f80332842275c0ba0f7af5 /spec/models/project_services/drone_ci_service_spec.rb | |
parent | 6ff740ff9484691750f3eadf12125fd362efe61c (diff) | |
parent | 29a23a4478d03e2cf70b09234c34e0f9dab2b4a9 (diff) | |
download | gitlab-ce-2f5394f5d640944a4efac9d89fcbdbcf79803f01.tar.gz |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'spec/models/project_services/drone_ci_service_spec.rb')
-rw-r--r-- | spec/models/project_services/drone_ci_service_spec.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/spec/models/project_services/drone_ci_service_spec.rb b/spec/models/project_services/drone_ci_service_spec.rb index a2cf68a9e38..3a8e67438fc 100644 --- a/spec/models/project_services/drone_ci_service_spec.rb +++ b/spec/models/project_services/drone_ci_service_spec.rb @@ -28,25 +28,18 @@ describe DroneCiService, models: true do describe 'validations' do context 'active' do - before { allow(subject).to receive(:activated?).and_return(true) } + before { subject.active = true } it { is_expected.to validate_presence_of(:token) } it { is_expected.to validate_presence_of(:drone_url) } - it { is_expected.to allow_value('ewf9843kdnfdfs89234n').for(:token) } - it { is_expected.to allow_value('http://ci.example.com').for(:drone_url) } - it { is_expected.not_to allow_value('this is not url').for(:drone_url) } - it { is_expected.not_to allow_value('http//noturl').for(:drone_url) } - it { is_expected.not_to allow_value('ftp://ci.example.com').for(:drone_url) } + it_behaves_like 'issue tracker service URL attribute', :drone_url end context 'inactive' do - before { allow(subject).to receive(:activated?).and_return(false) } + before { subject.active = false } it { is_expected.not_to validate_presence_of(:token) } it { is_expected.not_to validate_presence_of(:drone_url) } - it { is_expected.to allow_value('ewf9843kdnfdfs89234n').for(:token) } - it { is_expected.to allow_value('http://drone.example.com').for(:drone_url) } - it { is_expected.to allow_value('ftp://drone.example.com').for(:drone_url) } end end |