diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-18 14:56:05 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-18 14:56:05 -0800 |
| commit | 8ab4228b08c6f3bada042e7fd74ae1e2583e8191 (patch) | |
| tree | efbe726e17cce31961185ae83c5c1ebb82527bec /spec | |
| parent | b0979371b87d86cec1f35b6ac7f1242b917ab4d4 (diff) | |
| download | gitlab-shell-8ab4228b08c6f3bada042e7fd74ae1e2583e8191.tar.gz | |
Improve broadcast message logicv2.5.1
Expect broadcast message API endpoint to return 200 with empty JSON if
no broadcast messages available
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/gitlab_net_spec.rb | 4 | ||||
| -rw-r--r-- | spec/vcr_cassettes/broadcast_message-none.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/gitlab_net_spec.rb b/spec/gitlab_net_spec.rb index 17fb56d..3c2cea2 100644 --- a/spec/gitlab_net_spec.rb +++ b/spec/gitlab_net_spec.rb @@ -70,7 +70,7 @@ describe GitlabNet, vcr: true do it 'should return nil' do VCR.use_cassette("broadcast_message-none") do result = gitlab_net.broadcast_message - result.should == nil + result.should == {} end end end @@ -125,7 +125,7 @@ describe GitlabNet, vcr: true do it "raises an exception if the connection fails" do Net::HTTP.any_instance.stub(:request).and_raise(StandardError) - expect { + expect { gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'user-1', changes) }.to raise_error(GitlabNet::ApiUnreachableError) end diff --git a/spec/vcr_cassettes/broadcast_message-none.yml b/spec/vcr_cassettes/broadcast_message-none.yml index f94adc4..7d9d952 100644 --- a/spec/vcr_cassettes/broadcast_message-none.yml +++ b/spec/vcr_cassettes/broadcast_message-none.yml @@ -15,7 +15,7 @@ http_interactions: - Ruby response: status: - code: 404 + code: 200 message: Not Found headers: Server: @@ -32,7 +32,7 @@ http_interactions: - 200 OK body: encoding: UTF-8 - string: '{"message":"404 Not Found"}' + string: '{}' http_version: recorded_at: Sat, 07 Feb 2015 16:45:35 GMT recorded_with: VCR 2.4.0 |
