summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/data_builder
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2018-02-18 23:47:37 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2018-03-07 17:50:10 +0000
commit6253d4456a98613b419d766a03af7ff9b9fcf2af (patch)
tree6776fed77ca12bd4da5f8efec3301df124e08bd8 /spec/lib/gitlab/data_builder
parentd9ca76559f740bdeac78bcd9a7cfe60df5ef9795 (diff)
downloadgitlab-ce-6253d4456a98613b419d766a03af7ff9b9fcf2af.tar.gz
Backport changes from EE's GithubService integration
Adds detailed_status to pipeline hook data Adds detailed_description option for Services Integration edit page renders 404 if a service is disabled
Diffstat (limited to 'spec/lib/gitlab/data_builder')
-rw-r--r--spec/lib/gitlab/data_builder/pipeline_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/lib/gitlab/data_builder/pipeline_spec.rb b/spec/lib/gitlab/data_builder/pipeline_spec.rb
index f13041e498c..9ca960502c8 100644
--- a/spec/lib/gitlab/data_builder/pipeline_spec.rb
+++ b/spec/lib/gitlab/data_builder/pipeline_spec.rb
@@ -26,6 +26,7 @@ describe Gitlab::DataBuilder::Pipeline do
it { expect(attributes[:tag]).to eq(pipeline.tag) }
it { expect(attributes[:id]).to eq(pipeline.id) }
it { expect(attributes[:status]).to eq(pipeline.status) }
+ it { expect(attributes[:detailed_status]).to eq('passed') }
it { expect(build_data).to be_a(Hash) }
it { expect(build_data[:id]).to eq(build.id) }