Skip to content

Commit

Permalink
Fix Enterprise mode tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@tarebyte
tarebyte committed Mar 25, 2020
1 parent 499c5d8 commit 7299bb5
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 79 deletions.
66 changes: 0 additions & 66 deletions spec/octokit/client/authorizations_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,72 +225,6 @@ def note
end
end # .authorize_url

describe ".check_application_authorization" do
it "works in Enterprise mode" do
api_endpoint = "https://gh-enterprise.com/api/v3"
client_id = "abcde12345fghij67890"
client_secret = "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
token = "25f94a2a5c7fbaf499c665bc73d67c1c87e496da8985131633ee0a95819db2e8"

path = File.join(api_endpoint, "/applications/#{client_id}/tokens")

client = Octokit::Client.new(
client_id: client_id,
client_secret: client_secret,
api_endpoint: api_endpoint
)

request = stub_request(:post, path).with(basic_auth: [client_id, client_secret])
client.check_application_authorization(token, accept: preview_header)

assert_requested request
end
end # .check_application_authorization

describe ".reset_application_authorization" do
it "works in Enterprise mode" do
api_endpoint = "https://gh-enterprise.com/api/v3"
client_id = "abcde12345fghij67890"
client_secret = "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
token = "25f94a2a5c7fbaf499c665bc73d67c1c87e496da8985131633ee0a95819db2e8"

path = File.join(api_endpoint, "/applications/#{client_id}/tokens")

client = Octokit::Client.new(
client_id: client_id,
client_secret: client_secret,
api_endpoint: api_endpoint
)

request = stub_request(:patch, path).with(basic_auth: [client_id, client_secret])
client.reset_application_authorization(token, accept: preview_header)

assert_requested request
end
end # .reset_application_authorization

describe ".revoke_application_authorization" do
it "works in Enterprise mode" do
api_endpoint = "https://gh-enterprise.com/api/v3"
client_id = "abcde12345fghij67890"
client_secret = "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
token = "25f94a2a5c7fbaf499c665bc73d67c1c87e496da8985131633ee0a95819db2e8"

path = File.join(api_endpoint, "/applications/#{client_id}/tokens")

client = Octokit::Client.new(
client_id: client_id,
client_secret: client_secret,
api_endpoint: api_endpoint
)

request = stub_request(:delete, path).with(basic_auth: [client_id, client_secret])
client.revoke_application_authorization(token, accept: preview_header)

assert_requested request
end
end # .revoke_application_authorization

describe ".revoke_all_application_authorizations" do
before do
allow(@app_client).to receive(:octokit_warn)
Expand Down
86 changes: 73 additions & 13 deletions spec/octokit/client/oauth_applications_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
Octokit.reset!
end

describe '.check_token', :vcr do
it 'checks the token is valid' do
describe '.check_token' do
it 'checks the token is valid', :vcr do
@app_client.check_token(@access_token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])
path = "/applications/#{test_github_client_id}/token"

Expand All @@ -33,18 +33,38 @@
)
end

it 'has a .check_application_authorization alias' do
it 'has a .check_application_authorization alias', :vcr do
@app_client.check_application_authorization(@access_token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])
path = "/applications/#{test_github_client_id}/token"

expect(WebMock).to have_requested(:post, github_url(path)).with(
basic_auth: [test_github_client_id, test_github_client_secret],
)
end
end

describe '.reset_token', :vcr do
it 'resets the token' do
it "works in Enterprise mode" do
api_endpoint = "https://gh-enterprise.com/api/v3"
client_id = "abcde12345fghij67890"
client_secret = "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
token = "25f94a2a5c7fbaf499c665bc73d67c1c87e496da8985131633ee0a95819db2e8"

path = File.join(api_endpoint, "/applications/#{client_id}/token")

client = Octokit::Client.new(
client_id: client_id,
client_secret: client_secret,
api_endpoint: api_endpoint
)

request = stub_request(:post, path).with(basic_auth: [client_id, client_secret])
client.check_token(token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])

assert_requested request
end
end # .check_token

describe '.reset_token' do
it 'resets the token', :vcr do
@app_client.reset_token(@access_token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])
path = "/applications/#{test_github_client_id}/token"

Expand All @@ -53,18 +73,38 @@
)
end

it 'has a .reset_application_authorization alias' do
it 'has a .reset_application_authorization alias', :vcr do
@app_client.reset_application_authorization(@access_token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])
path = "/applications/#{test_github_client_id}/token"

expect(WebMock).to have_requested(:patch, github_url(path)).with(
basic_auth: [test_github_client_id, test_github_client_secret],
)
end
end

describe '.delete_app_token', :vcr do
it 'deletes the token' do
it "works in Enterprise mode" do
api_endpoint = "https://gh-enterprise.com/api/v3"
client_id = "abcde12345fghij67890"
client_secret = "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
token = "25f94a2a5c7fbaf499c665bc73d67c1c87e496da8985131633ee0a95819db2e8"

path = File.join(api_endpoint, "/applications/#{client_id}/token")

client = Octokit::Client.new(
client_id: client_id,
client_secret: client_secret,
api_endpoint: api_endpoint
)

request = stub_request(:patch, path).with(basic_auth: [client_id, client_secret])
client.reset_token(token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])

assert_requested request
end
end # .reset_token

describe '.delete_app_token' do
it 'deletes the token', :vcr do
@app_client.delete_app_token(@access_token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])
path = "/applications/#{test_github_client_id}/token"

Expand All @@ -73,7 +113,7 @@
)
end

it 'has a .delete_application_authorization alias' do
it 'has a .delete_application_authorization alias', :vcr do
@app_client.delete_application_authorization(@access_token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])
path = "/applications/#{test_github_client_id}/token"

Expand All @@ -82,15 +122,35 @@
)
end

it 'has a .revoke_application_authorization alias' do
it 'has a .revoke_application_authorization alias', :vcr do
@app_client.revoke_application_authorization(@access_token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])
path = "/applications/#{test_github_client_id}/token"

expect(WebMock).to have_requested(:delete, github_url(path)).with(
basic_auth: [test_github_client_id, test_github_client_secret],
)
end
end

it "works in Enterprise mode" do
api_endpoint = "https://gh-enterprise.com/api/v3"
client_id = "abcde12345fghij67890"
client_secret = "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
token = "25f94a2a5c7fbaf499c665bc73d67c1c87e496da8985131633ee0a95819db2e8"

path = File.join(api_endpoint, "/applications/#{client_id}/token")

client = Octokit::Client.new(
client_id: client_id,
client_secret: client_secret,
api_endpoint: api_endpoint
)

request = stub_request(:delete, path).with(basic_auth: [client_id, client_secret])
client.delete_app_token(token, accept: Octokit::Preview::PREVIEW_TYPES[:applications_api])

assert_requested request
end
end # .delete_app_token

describe '.delete_app_authorization', :vcr do
it "revokes the app's access to the user" do
Expand Down

0 comments on commit 7299bb5

Please sign in to comment.