Support options.endpoint without trailing slash (#30)

Author: rarkins

index.js

@@ -12,7 +12,7 @@ function ghGot(path, opts) {
 	opts = Object.assign({
 		json: true,
 		token: env.GITHUB_TOKEN,
-		endpoint: env.GITHUB_ENDPOINT ? env.GITHUB_ENDPOINT.replace(/[^/]$/, '$&/') : 'https://api.github.com/'
+		endpoint: env.GITHUB_ENDPOINT ? env.GITHUB_ENDPOINT : 'https://api.github.com/'
 	}, opts);
 
 	opts.headers = Object.assign({
@@ -29,7 +29,7 @@ function ghGot(path, opts) {
 		opts.headers['content-length'] = 0;
 	}
 
-	const url = /^https?/.test(path) ? path : opts.endpoint + path;
+	const url = /^https?/.test(path) ? path : opts.endpoint.replace(/\/$/, '') + '/' + path.replace(/^\//, '');
 
 	if (opts.stream) {
 		return got.stream(url, opts);

test.js

@@ -17,6 +17,14 @@ test('accepts options', async t => {
 	t.is((await m('users/sindresorhus', {})).body.login, 'sindresorhus');
 });
 
+test('accepts options.endpoint without trailing slash', async t => {
+	t.is((await m('users/sindresorhus', {endpoint: 'https://api.github.com'})).body.login, 'sindresorhus');
+});
+
+test('dedupes slashes', async t => {
+	t.is((await m('/users/sindresorhus', {endpoint: 'https://api.github.com/'})).body.login, 'sindresorhus');
+});
+
 test.serial('global token option', async t => {
 	process.env.GITHUB_TOKEN = 'fail';
 	await t.throws(m('users/sindresorhus'), 'Bad credentials (401)');