diff options
author | Vitali Tatarintev <vtatarintev@gitlab.com> | 2020-04-08 13:27:01 +0300 |
---|---|---|
committer | Vitali Tatarintev <vtatarintev@gitlab.com> | 2020-04-08 13:27:26 +0300 |
commit | 657eeeea3e5de2854084d8d8651754cf8a6668d1 (patch) | |
tree | 589d0c1dc99b8b3e5a1a58fb15c1529e56559e74 | |
parent | bd2d04953af8fc1d83f5b63abbfe51a310b2cb58 (diff) |
Remove unused broadcast_message endpoint
-rw-r--r-- | ruby/gitlab-shell/lib/gitlab_net.rb | 5 | ||||
-rw-r--r-- | ruby/gitlab-shell/spec/gitlab_net_spec.rb | 20 | ||||
-rw-r--r-- | ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml | 46 | ||||
-rw-r--r-- | ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml | 46 |
4 files changed, 0 insertions, 117 deletions
diff --git a/ruby/gitlab-shell/lib/gitlab_net.rb b/ruby/gitlab-shell/lib/gitlab_net.rb index 87f7a712d..812be9ae8 100644 --- a/ruby/gitlab-shell/lib/gitlab_net.rb +++ b/ruby/gitlab-shell/lib/gitlab_net.rb @@ -41,11 +41,6 @@ class GitlabNet # rubocop:disable Metrics/ClassLength GitAccessStatus.new(false, resp.code, API_INACCESSIBLE_MESSAGE) end - def broadcast_message - resp = get("#{internal_api_endpoint}/broadcast_message") - JSON.parse(resp.body) rescue {} - end - def check get("#{internal_api_endpoint}/check", options: { read_timeout: CHECK_TIMEOUT }) end diff --git a/ruby/gitlab-shell/spec/gitlab_net_spec.rb b/ruby/gitlab-shell/spec/gitlab_net_spec.rb index 43a894b35..f8161e222 100644 --- a/ruby/gitlab-shell/spec/gitlab_net_spec.rb +++ b/ruby/gitlab-shell/spec/gitlab_net_spec.rb @@ -41,26 +41,6 @@ describe GitlabNet, vcr: true do end end - describe '#broadcast_message' do - context "broadcast message exists" do - it 'should return message' do - VCR.use_cassette("broadcast_message-ok") do - result = gitlab_net.broadcast_message - expect(result["message"]).to eq("Message") - end - end - end - - context "broadcast message doesn't exist" do - it 'should return nil' do - VCR.use_cassette("broadcast_message-none") do - result = gitlab_net.broadcast_message - expect(result).to eq({}) - end - end - end - end - describe '#pre_receive' do let(:gl_repository) { "project-1" } let(:params) { { gl_repository: gl_repository } } diff --git a/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml b/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml deleted file mode 100644 index 8162343c2..000000000 --- a/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -http_interactions: -- request: - method: get - uri: http://localhost:3000/api/v4/internal/broadcast_message - body: - encoding: US-ASCII - string: secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - Content-Type: - - application/x-www-form-urlencoded - response: - status: - code: 200 - message: OK - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Content-Length: - - '2' - Content-Type: - - application/json - Date: - - Wed, 21 Jun 2017 10:44:50 GMT - Etag: - - W/"99914b932bd37a50b983c5e7c90ae93b" - Vary: - - Origin - X-Frame-Options: - - SAMEORIGIN - X-Request-Id: - - d31271ab-e21f-4349-a4c3-54f238c075c3 - X-Runtime: - - '0.254031' - body: - encoding: UTF-8 - string: "{}" - http_version: - recorded_at: Wed, 21 Jun 2017 10:44:50 GMT -recorded_with: VCR 2.4.0 diff --git a/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml b/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml deleted file mode 100644 index a309c7ed3..000000000 --- a/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -http_interactions: -- request: - method: get - uri: http://localhost:3000/api/v4/internal/broadcast_message - body: - encoding: US-ASCII - string: secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - Content-Type: - - application/x-www-form-urlencoded - response: - status: - code: 200 - message: OK - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Content-Length: - - '153' - Content-Type: - - application/json - Date: - - Wed, 21 Jun 2017 12:29:13 GMT - Etag: - - W/"ce6de457fcc884f50125e81a10f165ce" - Vary: - - Origin - X-Frame-Options: - - SAMEORIGIN - X-Request-Id: - - ebaaf2c2-112e-4b3c-9182-e8714cd2a29c - X-Runtime: - - '0.276085' - body: - encoding: UTF-8 - string: '{"message":"Message","starts_at":"2017-06-21T12:28:00.000Z","ends_at":"2017-06-21T12:35:00.000Z","color":"#e75e40","font":"#ffffff","id":1,"active":true}' - http_version: - recorded_at: Wed, 21 Jun 2017 12:29:13 GMT -recorded_with: VCR 2.4.0 |