Upgrade to ava@1.0.0-beta.7

sindresorhus · Aug 12, 2018 · ca2675e · ca2675e
1 parent f30b623
commit ca2675e
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 80 deletions.
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
 		"url-parse-lax": "^3.0.0"
 	},
 	"devDependencies": {
-		"ava": "^1.0.0-beta.6",
+		"ava": "1.0.0-beta.7",
 		"coveralls": "^3.0.0",
 		"delay": "^3.0.0",
 		"form-data": "^2.1.1",
@@ -58,7 +58,7 @@
 		"slow-stream": "0.0.4",
 		"tempfile": "^2.0.0",
 		"tempy": "^0.2.1",
-		"xo": "^0.21.1"
+		"xo": "^0.22.0"
 	},
 	"ava": {
 		"concurrency": 4

diff --git a/test/arguments.js b/test/arguments.js
@@ -34,12 +34,12 @@ test.after('cleanup', async () => {
 });
 
 test('url is required', async t => {
-	const error = await t.throws(got());
+	const error = await t.throwsAsync(got());
 	t.regex(error.message, /Parameter `url` must be a string or object, not undefined/);
 });
 
 test('url should be utf-8 encoded', async t => {
-	const error = await t.throws(got(`${s.url}/%D2%E0%EB%EB%E8%ED`));
+	const error = await t.throwsAsync(got(`${s.url}/%D2%E0%EB%EB%E8%ED`));
 	t.regex(error.message, /Parameter `url` must contain valid UTF-8 character sequences/);
 });
 
@@ -100,12 +100,12 @@ test('overrides querystring from opts', async t => {
 });
 
 test('should throw with auth in url string', async t => {
-	const error = await t.throws(got('https://test:45d3ps453@account.myservice.com/api/token'));
+	const error = await t.throwsAsync(got('https://test:45d3ps453@account.myservice.com/api/token'));
 	t.regex(error.message, /Basic authentication must be done with the `auth` option/);
 });
 
 test('does not throw with auth in url object', async t => {
-	await t.notThrows(got({
+	await t.notThrowsAsync(got({
 		auth: 'foo:bar',
 		hostname: s.host,
 		port: s.port,
@@ -114,12 +114,12 @@ test('does not throw with auth in url object', async t => {
 });
 
 test('should throw when body is set to object', async t => {
-	await t.throws(got(`${s.url}/`, {body: {}}), TypeError);
+	await t.throwsAsync(got(`${s.url}/`, {body: {}}), TypeError);
 });
 
 test('WHATWG URL support', async t => {
 	const wURL = new URL(`${s.url}/test`);
-	await t.notThrows(got(wURL));
+	await t.notThrowsAsync(got(wURL));
 });
 
 test('should return streams when using stream option', async t => {
@@ -133,12 +133,12 @@ test('should ignore JSON option when using stream option', async t => {
 });
 
 test('throws TypeError when `url` is passed as an option', async t => {
-	await t.throws(got('', {url: 'example.com'}), {instanceOf: TypeError});
-	await t.throws(got({url: 'example.com'}), {instanceOf: TypeError});
+	await t.throwsAsync(got('', {url: 'example.com'}), {instanceOf: TypeError});
+	await t.throwsAsync(got({url: 'example.com'}), {instanceOf: TypeError});
 });
 
 test('throws TypeError when `hooks` is not an object', async t => {
-	await t.throws(
+	await t.throwsAsync(
 		() => got(s.url, {hooks: 'not object'}),
 		{
 			instanceOf: TypeError,
@@ -148,7 +148,7 @@ test('throws TypeError when `hooks` is not an object', async t => {
 });
 
 test('throws TypeError when known `hooks` value is not an array', async t => {
-	await t.throws(
+	await t.throwsAsync(
 		() => got(s.url, {hooks: {beforeRequest: {}}}),
 		{
 			instanceOf: TypeError,
@@ -158,7 +158,7 @@ test('throws TypeError when known `hooks` value is not an array', async t => {
 });
 
 test('throws TypeError when known `hooks` array item is not a function', async t => {
-	await t.throws(
+	await t.throwsAsync(
 		() => got(s.url, {hooks: {beforeRequest: [{}]}}),
 		{
 			instanceOf: TypeError,
@@ -168,7 +168,7 @@ test('throws TypeError when known `hooks` array item is not a function', async t
 });
 
 test('allows extra keys in `hooks`', async t => {
-	await t.notThrows(() => got(`${s.url}/test`, {hooks: {extra: {}}}));
+	await t.notThrowsAsync(() => got(`${s.url}/test`, {hooks: {extra: {}}}));
 });
 
 test('throws when trying to modify baseUrl after options got normalized', async t => {
@@ -180,5 +180,5 @@ test('throws when trying to modify baseUrl after options got normalized', async
 		}
 	});
 
-	await t.throws(instanceA('/'), 'Failed to set baseUrl. Options are normalized already.');
+	await t.throwsAsync(instanceA('/'), 'Failed to set baseUrl. Options are normalized already.');
 });
diff --git a/test/cache.js b/test/cache.js
@@ -102,6 +102,6 @@ test('Cache error throws got.CacheError', async t => {
 	const endpoint = '/no-store';
 	const cache = {};
 
-	const error = await t.throws(got(s.url + endpoint, {cache}));
+	const error = await t.throwsAsync(got(s.url + endpoint, {cache}));
 	t.is(error.name, 'CacheError');
 });
diff --git a/test/cancel.js b/test/cancel.js
@@ -53,8 +53,8 @@ test('cancel do not retry after cancelation', async t => {
 		p.cancel();
 	});
 
-	await t.throws(p, PCancelable.CancelError);
-	await t.notThrows(helper.aborted, 'Request finished instead of aborting.');
+	await t.throwsAsync(p, PCancelable.CancelError);
+	await t.notThrowsAsync(helper.aborted, 'Request finished instead of aborting.');
 });
 
 test('cancel in-progress request', async t => {
@@ -72,8 +72,8 @@ test('cancel in-progress request', async t => {
 		body.push(null);
 	});
 
-	await t.throws(p, PCancelable.CancelError);
-	await t.notThrows(helper.aborted, 'Request finished instead of aborting.');
+	await t.throwsAsync(p, PCancelable.CancelError);
+	await t.notThrowsAsync(helper.aborted, 'Request finished instead of aborting.');
 });
 
 test('cancel in-progress request with timeout', async t => {
@@ -91,8 +91,8 @@ test('cancel in-progress request with timeout', async t => {
 		body.push(null);
 	});
 
-	await t.throws(p, PCancelable.CancelError);
-	await t.notThrows(helper.aborted, 'Request finished instead of aborting.');
+	await t.throwsAsync(p, PCancelable.CancelError);
+	await t.notThrowsAsync(helper.aborted, 'Request finished instead of aborting.');
 });
 
 test('cancel immediately', async t => {
@@ -111,8 +111,8 @@ test('cancel immediately', async t => {
 
 	const p = got(`${s.url}/abort`);
 	p.cancel();
-	await t.throws(p);
-	await t.notThrows(aborted, 'Request finished instead of aborting.');
+	await t.throwsAsync(p);
+	await t.notThrowsAsync(aborted, 'Request finished instead of aborting.');
 });
 
 test('recover from cancelation using cancelable promise attribute', async t => {
@@ -128,7 +128,7 @@ test('recover from cancelation using cancelable promise attribute', async t => {
 
 	p.cancel();
 
-	await t.notThrows(recover);
+	await t.notThrowsAsync(recover);
 });
 
 test('recover from cancellation using error instance', async t => {
@@ -144,5 +144,5 @@ test('recover from cancellation using error instance', async t => {
 
 	p.cancel();
 
-	await t.notThrows(recover);
+	await t.notThrowsAsync(recover);
 });
diff --git a/test/error.js b/test/error.js
@@ -45,7 +45,7 @@ test.after('cleanup', async () => {
 });
 
 test('properties', async t => {
-	const error = await t.throws(got(s.url));
+	const error = await t.throwsAsync(got(s.url));
 	t.truthy(error);
 	t.truthy(error.response);
 	t.false({}.propertyIsEnumerable.call(error, 'response'));
@@ -60,27 +60,27 @@ test('properties', async t => {
 });
 
 test('dns message', async t => {
-	const error = await t.throws(got('.com', {retry: 0}));
+	const error = await t.throwsAsync(got('.com', {retry: 0}));
 	t.truthy(error);
 	t.regex(error.message, /getaddrinfo ENOTFOUND/);
 	t.is(error.host, '.com');
 	t.is(error.method, 'GET');
 });
 
 test('options.body error message', async t => {
-	await t.throws(got(s.url, {body: {}}), {
+	await t.throwsAsync(got(s.url, {body: {}}), {
 		message: 'The `body` option must be a stream.Readable, string or Buffer'
 	});
 });
 
 test('options.body json error message', async t => {
-	await t.throws(got(s.url, {body: Buffer.from('test'), json: true}), {
+	await t.throwsAsync(got(s.url, {body: Buffer.from('test'), json: true}), {
 		message: 'The `body` option must be an Object or Array when the `json` option is used'
 	});
 });
 
 test('options.body form error message', async t => {
-	await t.throws(got(s.url, {body: Buffer.from('test'), form: true}), {
+	await t.throwsAsync(got(s.url, {body: Buffer.from('test'), form: true}), {
 		message: 'The `body` option must be an Object when the `form` option is used'
 	});
 });
@@ -96,19 +96,19 @@ test('no plain object restriction on body', async t => {
 });
 
 test('default status message', async t => {
-	const error = await t.throws(got(`${s.url}/default-status-message`));
+	const error = await t.throwsAsync(got(`${s.url}/default-status-message`));
 	t.is(error.statusCode, 400);
 	t.is(error.statusMessage, 'Bad Request');
 });
 
 test('custom status message', async t => {
-	const error = await t.throws(got(`${s.url}/custom-status-message`));
+	const error = await t.throwsAsync(got(`${s.url}/custom-status-message`));
 	t.is(error.statusCode, 400);
 	t.is(error.statusMessage, 'Something Exploded');
 });
 
 test('no status message is overriden by the default one', async t => {
-	const error = await t.throws(got(`${s.url}/no-status-message`));
+	const error = await t.throwsAsync(got(`${s.url}/no-status-message`));
 	t.is(error.statusCode, 400);
 	t.is(error.statusMessage, http.STATUS_CODES[400]);
 });
@@ -117,7 +117,7 @@ test.serial('http.request error', async t => {
 	const stub = sinon.stub(http, 'request').callsFake(() => {
 		throw new TypeError('The header content contains invalid characters');
 	});
-	await t.throws(got(s.url), {instanceOf: got.RequestError, message: 'The header content contains invalid characters'});
+	await t.throwsAsync(got(s.url), {instanceOf: got.RequestError, message: 'The header content contains invalid characters'});
 	stub.restore();
 });
 
@@ -131,7 +131,7 @@ test.serial('catch error in mimicResponse', async t => {
 		'mimic-response': mimicResponse
 	});
 
-	await t.throws(proxiedGot(s.url), {message: 'Error in mimic-response'});
+	await t.throwsAsync(proxiedGot(s.url), {message: 'Error in mimic-response'});
 });
 
 test('errors are thrown directly when options.stream is true', t => {

diff --git a/test/gzip.js b/test/gzip.js
@@ -64,14 +64,14 @@ test('decompress content - stream', async t => {
 });
 
 test('handles gzip error', async t => {
-	const error = await t.throws(got(`${s.url}/corrupted`));
+	const error = await t.throwsAsync(got(`${s.url}/corrupted`));
 	t.is(error.message, 'incorrect header check');
 	t.is(error.path, '/corrupted');
 	t.is(error.name, 'ReadError');
 });
 
 test('handles gzip error - stream', async t => {
-	const error = await t.throws(getStream(got.stream(`${s.url}/corrupted`)));
+	const error = await t.throwsAsync(getStream(got.stream(`${s.url}/corrupted`)));
 	t.is(error.message, 'incorrect header check');
 	t.is(error.path, '/corrupted');
 	t.is(error.name, 'ReadError');

diff --git a/test/helpers.js b/test/helpers.js
@@ -26,9 +26,9 @@ test.after('cleanup', async () => {
 test('promise mode', async t => {
 	t.is((await got.get(s.url)).body, 'ok');
 
-	const error = await t.throws(got.get(`${s.url}/404`));
+	const error = await t.throwsAsync(got.get(`${s.url}/404`));
 	t.is(error.response.body, 'not found');
 
-	const error2 = await t.throws(got.get('.com', {retry: 0}));
+	const error2 = await t.throwsAsync(got.get('.com', {retry: 0}));
 	t.truthy(error2);
 });
diff --git a/test/hooks.js b/test/hooks.js
@@ -73,7 +73,7 @@ test('beforeRequest awaits async function', async t => {
 });
 
 test('beforeRequest rejects when beforeRequest throws', async t => {
-	await t.throws(
+	await t.throwsAsync(
 		() => got(s.url, {
 			hooks: {
 				beforeRequest: [
@@ -91,7 +91,7 @@ test('beforeRequest rejects when beforeRequest throws', async t => {
 });
 
 test('beforeRequest rejects when beforeRequest rejects', async t => {
-	await t.throws(
+	await t.throwsAsync(
 		() => got(s.url, {
 			hooks: {
 				beforeRequest: [() => Promise.reject(new Error('oops'))]

diff --git a/test/http.js b/test/http.js
@@ -51,14 +51,14 @@ test('requestUrl response', async t => {
 });
 
 test('error with code', async t => {
-	const error = await t.throws(got(`${s.url}/404`));
+	const error = await t.throwsAsync(got(`${s.url}/404`));
 	t.is(error.statusCode, 404);
 	t.is(error.response.body, 'not');
 });
 
 test('status code 304 doesn\'t throw', async t => {
 	const p = got(`${s.url}/304`);
-	await t.notThrows(p);
+	await t.notThrowsAsync(p);
 	const response = await p;
 	t.is(response.statusCode, 304);
 	t.is(response.body, '');
@@ -69,7 +69,7 @@ test('doesn\'t throw on throwHttpErrors === false', async t => {
 });
 
 test('invalid protocol throws', async t => {
-	const error = await t.throws(got('c:/nope.com', {json: true}));
+	const error = await t.throwsAsync(got('c:/nope.com', {json: true}));
 	t.is(error.constructor, got.UnsupportedProtocolError);
 });
 

diff --git a/test/json-parse.js b/test/json-parse.js
@@ -51,26 +51,26 @@ test('not parses responses without a body', async t => {
 });
 
 test('wraps parsing errors', async t => {
-	const error = await t.throws(got(`${s.url}/invalid`, {json: true}));
+	const error = await t.throwsAsync(got(`${s.url}/invalid`, {json: true}));
 	t.regex(error.message, /Unexpected token/);
 	t.true(error.message.includes(error.hostname), error.message);
 	t.is(error.path, '/invalid');
 });
 
 test('parses non-200 responses', async t => {
-	const error = await t.throws(got(`${s.url}/non200`, {json: true}));
+	const error = await t.throwsAsync(got(`${s.url}/non200`, {json: true}));
 	t.deepEqual(error.response.body, {data: 'dog'});
 });
 
 test('ignores errors on invalid non-200 responses', async t => {
-	const error = await t.throws(got(`${s.url}/non200-invalid`, {json: true}));
+	const error = await t.throwsAsync(got(`${s.url}/non200-invalid`, {json: true}));
 	t.is(error.message, 'Response code 500 (Internal Server Error)');
 	t.is(error.response.body, 'Internal error');
 	t.is(error.path, '/non200-invalid');
 });
 
 test('should have statusCode in error', async t => {
-	const error = await t.throws(got(`${s.url}/invalid`, {json: true}));
+	const error = await t.throwsAsync(got(`${s.url}/invalid`, {json: true}));
 	t.is(error.constructor, got.ParseError);
 	t.is(error.statusCode, 200);
 });

diff --git a/test/post.js b/test/post.js
@@ -58,7 +58,7 @@ test('sends plain objects as forms', async t => {
 });
 
 test('does NOT support sending arrays as forms', async t => {
-	await t.throws(got(s.url, {
+	await t.throwsAsync(got(s.url, {
 		body: ['such', 'wow'],
 		form: true
 	}), TypeError);
@@ -141,9 +141,9 @@ test('content-type header is not overriden when object in options.body', async t
 });
 
 test('throws when json body is not a plain object or array', async t => {
-	await t.throws(got(`${s.url}`, {body: '{}', json: true}), TypeError);
+	await t.throwsAsync(got(`${s.url}`, {body: '{}', json: true}), TypeError);
 });
 
 test('throws when form body is not a plain object or array', async t => {
-	await t.throws(got(`${s.url}`, {body: 'such=wow', form: true}), TypeError);
+	await t.throwsAsync(got(`${s.url}`, {body: 'such=wow', form: true}), TypeError);
 });