Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0a6437f4
Commit
0a6437f4
authored
Mar 26, 2021
by
Justin Ho
Committed by
Arturo Herrero
Mar 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add HipChat to the list of disabled services
Update feature specs accordingly
parent
7e016820
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
43 deletions
+8
-43
app/models/project.rb
app/models/project.rb
+2
-2
changelogs/unreleased/27954-remove-hipchat-project-service.yml
...elogs/unreleased/27954-remove-hipchat-project-service.yml
+5
-0
spec/features/projects/services/user_activates_hipchat_spec.rb
...features/projects/services/user_activates_hipchat_spec.rb
+0
-40
spec/features/projects/services/user_views_services_spec.rb
spec/features/projects/services/user_views_services_spec.rb
+1
-1
No files found.
app/models/project.rb
View file @
0a6437f4
...
...
@@ -1370,9 +1370,9 @@ class Project < ApplicationRecord
end
def
disabled_services
return
%w(datadog)
unless
Feature
.
enabled?
(
:datadog_ci_integration
,
self
)
return
%w(datadog
hipchat
)
unless
Feature
.
enabled?
(
:datadog_ci_integration
,
self
)
[]
%w(hipchat)
end
def
find_or_initialize_service
(
name
)
...
...
changelogs/unreleased/27954-remove-hipchat-project-service.yml
0 → 100644
View file @
0a6437f4
---
title
:
Remove HipChat integration from frontend and docs
merge_request
:
57556
author
:
type
:
deprecated
spec/features/projects/services/user_activates_hipchat_spec.rb
deleted
100644 → 0
View file @
7e016820
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
'User activates HipChat'
,
:js
do
include_context
'project service activation'
context
'with standard settings'
do
before
do
stub_request
(
:post
,
/.*api.hipchat.com.*/
)
end
it
'activates service'
do
visit_project_integration
(
'HipChat'
)
fill_in
(
'Room'
,
with:
'gitlab'
)
fill_in
(
'Token'
,
with:
'verySecret'
)
click_test_then_save_integration
(
expect_test_to_fail:
false
)
expect
(
page
).
to
have_content
(
'HipChat settings saved and active.'
)
end
end
context
'with custom settings'
do
before
do
stub_request
(
:post
,
/.*chat.example.com.*/
)
end
it
'activates service'
do
visit_project_integration
(
'HipChat'
)
fill_in
(
'Room'
,
with:
'gitlab_custom'
)
fill_in
(
'Token'
,
with:
'secretCustom'
)
fill_in
(
'Server'
,
with:
'https://chat.example.com'
)
click_test_then_save_integration
(
expect_test_to_fail:
false
)
expect
(
page
).
to
have_content
(
'HipChat settings saved and active.'
)
end
end
end
spec/features/projects/services/user_views_services_spec.rb
View file @
0a6437f4
...
...
@@ -10,7 +10,7 @@ RSpec.describe 'User views services' do
expect
(
page
).
to
have_content
(
'Integrations'
)
expect
(
page
).
to
have_content
(
'Campfire'
)
expect
(
page
).
to
have_content
(
'
HipChat
'
)
expect
(
page
).
to
have_content
(
'
Jira
'
)
expect
(
page
).
to
have_content
(
'Assembla'
)
expect
(
page
).
to
have_content
(
'Pushover'
)
expect
(
page
).
to
have_content
(
'Atlassian Bamboo'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment