diff options
author | Ash McKenzie <ash@the-rebellion.net> | 2018-07-20 11:34:01 +1000 |
---|---|---|
committer | Ash McKenzie <ash@the-rebellion.net> | 2018-07-20 22:28:58 +1000 |
commit | c92bfcefece5eea1fa30f75f7e99212c09b5792e (patch) | |
tree | 09b5c83caadd778e4173257469ade986665ce12e /spec/gitlab_net_spec.rb | |
parent | 41396a775e13734eeb67df715744a16b622ed7b7 (diff) | |
download | gitlab-shell-c92bfcefece5eea1fa30f75f7e99212c09b5792e.tar.gz |
Rspec upgrade and deprecation fixesash.mckenzie/minor-tidy-up
Diffstat (limited to 'spec/gitlab_net_spec.rb')
-rw-r--r-- | spec/gitlab_net_spec.rb | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/spec/gitlab_net_spec.rb b/spec/gitlab_net_spec.rb index 982c4c5..be2f4ba 100644 --- a/spec/gitlab_net_spec.rb +++ b/spec/gitlab_net_spec.rb @@ -3,7 +3,7 @@ require_relative '../lib/gitlab_net' require_relative '../lib/gitlab_access_status' describe GitlabNet, vcr: true do - let(:gitlab_net) { GitlabNet.new } + let(:gitlab_net) { described_class.new } let(:changes) { ['0000000000000000000000000000000000000000 92d0970eefd7acb6d548878925ce2208cfe2d2ec refs/heads/branch4'] } let(:base_api_endpoint) { 'http://localhost:3000/api/v4' } let(:internal_api_endpoint) { 'http://localhost:3000/api/v4/internal' } @@ -13,11 +13,12 @@ describe GitlabNet, vcr: true do let(:secret) { "0a3938d9d95d807e94d937af3a4fbbea\n" } before do + $logger = double('logger').as_null_object gitlab_net.stub(:base_api_endpoint).and_return(base_api_endpoint) gitlab_net.stub(:secret_token).and_return(secret) end - describe :check do + describe '#check' do it 'should return 200 code for gitlab check' do VCR.use_cassette("check-ok") do result = gitlab_net.check @@ -38,7 +39,7 @@ describe GitlabNet, vcr: true do end end - describe :discover do + describe '#discover' do it 'should return user has based on key id' do VCR.use_cassette("discover-ok") do user = gitlab_net.discover(key) @@ -75,7 +76,7 @@ describe GitlabNet, vcr: true do end end - describe :broadcast_message do + describe '#broadcast_message' do context "broadcast message exists" do it 'should return message' do VCR.use_cassette("broadcast_message-ok") do @@ -95,7 +96,7 @@ describe GitlabNet, vcr: true do end end - describe :merge_request_urls do + describe '#merge_request_urls' do let(:gl_repository) { "project-1" } let(:changes) { "123456 789012 refs/heads/test\n654321 210987 refs/tags/tag" } let(:encoded_changes) { "123456%20789012%20refs/heads/test%0A654321%20210987%20refs/tags/tag" } @@ -127,7 +128,7 @@ describe GitlabNet, vcr: true do end end - describe :pre_receive do + describe '#pre_receive' do let(:gl_repository) { "project-1" } let(:params) { { gl_repository: gl_repository } } @@ -153,7 +154,7 @@ describe GitlabNet, vcr: true do end end - describe :post_receive do + describe '#post_receive' do let(:gl_repository) { "project-1" } let(:changes) { "123456 789012 refs/heads/test\n654321 210987 refs/tags/tag" } let(:params) do @@ -193,7 +194,7 @@ describe GitlabNet, vcr: true do end end - describe :authorized_key do + describe '#authorized_key' do let (:ssh_key) { "rsa-key" } it "should return nil when the resource is not implemented" do @@ -228,7 +229,7 @@ describe GitlabNet, vcr: true do it 'returns two factor recovery codes' do VCR.use_cassette('two-factor-recovery-codes') do result = gitlab_net.two_factor_recovery_codes(key) - expect(result['success']).to be_true + expect(result['success']).to be_truthy expect(result['recovery_codes']).to eq(['f67c514de60c4953','41278385fc00c1e0']) end end @@ -236,7 +237,7 @@ describe GitlabNet, vcr: true do it 'returns false when recovery codes cannot be generated' do VCR.use_cassette('two-factor-recovery-codes-fail') do result = gitlab_net.two_factor_recovery_codes('key-777') - expect(result['success']).to be_false + expect(result['success']).to be_falsey expect(result['message']).to eq('Could not find the given key') end end @@ -258,17 +259,17 @@ describe GitlabNet, vcr: true do it 'returns true if notification was succesful' do VCR.use_cassette('notify-post-receive') do - expect(gitlab_net.notify_post_receive(gl_repository, repo_path)).to be_true + expect(gitlab_net.notify_post_receive(gl_repository, repo_path)).to be_truthy end end end - describe :check_access do + describe '#check_access' do context 'ssh key with access nil, to project' do it 'should allow pull access for host' do VCR.use_cassette("allowed-pull") do access = gitlab_net.check_access('git-receive-pack', nil, project, key, changes, 'ssh') - access.allowed?.should be_true + access.allowed?.should be_truthy end end @@ -282,7 +283,7 @@ describe GitlabNet, vcr: true do it 'should allow push access for host' do VCR.use_cassette("allowed-push") do access = gitlab_net.check_access('git-upload-pack', nil, project, key, changes, 'ssh') - access.allowed?.should be_true + access.allowed?.should be_truthy end end end @@ -291,7 +292,7 @@ describe GitlabNet, vcr: true do it 'should deny pull access for host' do VCR.use_cassette('ssh-pull-disabled') do access = gitlab_net.check_access('git-upload-pack', nil, project, key, changes, 'ssh') - access.allowed?.should be_false + access.allowed?.should be_falsey access.message.should eq 'Git access over SSH is not allowed' end end @@ -299,7 +300,7 @@ describe GitlabNet, vcr: true do it 'should deny push access for host' do VCR.use_cassette('ssh-push-disabled') do access = gitlab_net.check_access('git-receive-pack', nil, project, key, changes, 'ssh') - access.allowed?.should be_false + access.allowed?.should be_falsey access.message.should eq 'Git access over SSH is not allowed' end end @@ -309,7 +310,7 @@ describe GitlabNet, vcr: true do it 'should deny pull access for host' do VCR.use_cassette('http-pull-disabled') do access = gitlab_net.check_access('git-upload-pack', nil, project, key, changes, 'http') - access.allowed?.should be_false + access.allowed?.should be_falsey access.message.should eq 'Pulling over HTTP is not allowed.' end end @@ -317,7 +318,7 @@ describe GitlabNet, vcr: true do it 'should deny push access for host' do VCR.use_cassette("http-push-disabled") do access = gitlab_net.check_access('git-receive-pack', nil, project, key, changes, 'http') - access.allowed?.should be_false + access.allowed?.should be_falsey access.message.should eq 'Pushing over HTTP is not allowed.' end end @@ -327,21 +328,21 @@ describe GitlabNet, vcr: true do it 'should deny pull access for host' do VCR.use_cassette("ssh-pull-project-denied") do access = gitlab_net.check_access('git-receive-pack', nil, project, key2, changes, 'ssh') - access.allowed?.should be_false + access.allowed?.should be_falsey end end it 'should deny push access for host' do VCR.use_cassette("ssh-push-project-denied") do access = gitlab_net.check_access('git-upload-pack', nil, project, key2, changes, 'ssh') - access.allowed?.should be_false + access.allowed?.should be_falsey end end it 'should deny push access for host (with user)' do VCR.use_cassette("ssh-push-project-denied-with-user") do access = gitlab_net.check_access('git-upload-pack', nil, project, 'user-2', changes, 'ssh') - access.allowed?.should be_false + access.allowed?.should be_falsey end end end @@ -354,24 +355,27 @@ describe GitlabNet, vcr: true do end end - describe :base_api_endpoint do - let(:net) { GitlabNet.new } + describe '#base_api_endpoint' do + let(:net) { described_class.new } + subject { net.send :base_api_endpoint } - it { should include(net.send(:config).gitlab_url) } + it { is_expected.to include(net.send(:config).gitlab_url) } it("uses API version 4") { should end_with("api/v4") } end - describe :internal_api_endpoint do - let(:net) { GitlabNet.new } + describe '#internal_api_endpoint' do + let(:net) { described_class.new } + subject { net.send :internal_api_endpoint } - it { should include(net.send(:config).gitlab_url) } + it { is_expected.to include(net.send(:config).gitlab_url) } it("uses API version 4") { should end_with("api/v4/internal") } end - describe :http_client_for do + describe '#http_client_for' do subject { gitlab_net.send :http_client_for, URI('https://localhost/') } + before do gitlab_net.stub :cert_store gitlab_net.send(:config).stub(:http_settings) { {'self_signed_cert' => true} } @@ -380,7 +384,7 @@ describe GitlabNet, vcr: true do its(:verify_mode) { should eq(OpenSSL::SSL::VERIFY_NONE) } end - describe :http_request_for do + describe '#http_request_for' do context 'with stub' do let(:get) { double(Net::HTTP::Get) } let(:user) { 'user' } @@ -462,7 +466,7 @@ describe GitlabNet, vcr: true do end end - describe :cert_store do + describe '#cert_store' do let(:store) do double(OpenSSL::X509::Store).tap do |store| OpenSSL::X509::Store.stub(:new) { store } |