@anmiles/google-api-wrapper 7.0.6 → 7.0.7

package/dist/lib/sleep.js

@@ -1,11 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = void 0;
-exports.default = { sleep };
-async function sleep(milliSeconds) {
-    return new Promise((resolve) => {
-        setTimeout(resolve, milliSeconds);
-    });
-}
-exports.sleep = sleep;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sleep = void 0;
+exports.default = { sleep };
+async function sleep(milliSeconds) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, milliSeconds);
+    });
+}
+exports.sleep = sleep;
 //# sourceMappingURL=sleep.js.map

package/dist/types/common.d.ts

@@ -1,3 +1,3 @@
-export interface CommonOptions {
-    hideProgress?: boolean;
-}
+export interface CommonOptions {
+    hideProgress?: boolean;
+}

package/dist/types/common.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=common.js.map

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export * from './common';
-export * from './secrets';
+export * from './common';
+export * from './secrets';

package/dist/types/index.js

@@ -1,19 +1,19 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./common"), exports);
-__exportStar(require("./secrets"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./common"), exports);
+__exportStar(require("./secrets"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/secrets.d.ts

@@ -1,15 +1,15 @@
-export interface Secrets {
-    web: {
-        client_id: `${string}.apps.googleusercontent.com`;
-        project_id: string;
-        auth_uri: 'https://accounts.google.com/o/oauth2/auth';
-        token_uri: 'https://oauth2.googleapis.com/token';
-        auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs';
-        client_secret: string;
-        redirect_uris: string[];
-    };
-}
-export interface AuthOptions {
-    temporary?: boolean;
-    scopes?: string[];
-}
+export interface Secrets {
+    web: {
+        client_id: `${string}.apps.googleusercontent.com`;
+        project_id: string;
+        auth_uri: 'https://accounts.google.com/o/oauth2/auth';
+        token_uri: 'https://oauth2.googleapis.com/token';
+        auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs';
+        client_secret: string;
+        redirect_uris: string[];
+    };
+}
+export interface AuthOptions {
+    temporary?: boolean;
+    scopes?: string[];
+}

package/dist/types/secrets.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=secrets.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anmiles/google-api-wrapper",
-  "version": "7.0.6",
+  "version": "7.0.7",
   "description": "Provides quick interface for getting google API data",
   "keywords": [
     "google",
@@ -8,8 +8,8 @@
     "auth"
   ],
   "author": "Anatoliy Oblaukhov",
-  "homepage": "https://gitlab.com/anmiles/google-api-wrapper",
-  "repository": "gitlab:anmiles/google-api-wrapper",
+  "homepage": "https://gitlab.com/anmiles/lib/google-api-wrapper",
+  "repository": "gitlab:anmiles/lib/google-api-wrapper",
   "license": "MIT",
   "engines": {
     "node": ">=18.14.2"
@@ -29,25 +29,26 @@
     "login": "node ./dist/login.js"
   },
   "dependencies": {
-    "colorette": "^2.0.19",
+    "@anmiles/logger": "^2.1.2",
     "execa": "^5.1.1",
-    "googleapis": "^104.0.0",
+    "googleapis": "^118.0.0",
     "open": "^8.4.2",
     "server-destroy": "^1.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^28.1.3",
+    "@anmiles/eslint-config": "^1.0.6",
+    "@types/jest": "^29.5.1",
     "@types/server-destroy": "^1.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.30.0",
-    "@typescript-eslint/parser": "^5.30.0",
-    "eslint": "^8.18.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
+    "eslint": "^8.40.0",
     "eslint-plugin-align-assignments": "^1.1.2",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.5.3",
-    "jest": "^28.1.2",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.1",
+    "jest": "^29.5.0",
     "nyc": "^15.1.0",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^28.0.5",
-    "typescript": "^4.7.4"
+    "rimraf": "^5.0.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.0.4"
   }
 }

package/src/lib/__tests__/auth.test.ts

@@ -1,6 +1,6 @@
 import { google } from 'googleapis';
 import type GoogleApis from 'googleapis';
-import logger from '../logger';
+import logger from '@anmiles/logger';
 import profiles from '../profiles';
 import secrets from '../secrets';
 
@@ -11,7 +11,7 @@ jest.mock<typeof auth>('../auth', () => ({
 	getAuth : jest.fn().mockImplementation(async () => googleAuth),
 }));
 
-jest.mock<Partial<typeof logger>>('../logger', () => ({
+jest.mock<Partial<typeof logger>>('@anmiles/logger', () => ({
 	info : jest.fn(),
 	warn : jest.fn(),
 }));
@@ -56,95 +56,95 @@ describe('src/lib/auth', () => {
 	describe('login', () => {
 		it('should get profiles', async () => {
 			await original.login();
-			expect(profiles.getProfiles).toBeCalledWith();
+			expect(profiles.getProfiles).toHaveBeenCalledWith();
 		});
 
 		it('should auth all profiles', async () => {
 			await original.login();
 
 			allProfiles.forEach((profile) => {
-				expect(auth.getAuth).toBeCalledWith(profile, undefined);
+				expect(auth.getAuth).toHaveBeenCalledWith(profile, undefined);
 			});
 		});
 
 		it('should auth only specified profile', async () => {
 			await original.login('username1');
 
-			expect(auth.getAuth).toBeCalledWith('username1', undefined);
-			expect(auth.getAuth).not.toBeCalledWith('username2', undefined);
+			expect(auth.getAuth).toHaveBeenCalledWith('username1', undefined);
+			expect(auth.getAuth).not.toHaveBeenCalledWith('username2', undefined);
 		});
 
 		it('should pass temporariness for all profiles', async () => {
 			await original.login(undefined, { temporary : true });
 
-			expect(auth.getAuth).toBeCalledWith('username1', { temporary : true });
-			expect(auth.getAuth).toBeCalledWith('username2', { temporary : true });
+			expect(auth.getAuth).toHaveBeenCalledWith('username1', { temporary : true });
+			expect(auth.getAuth).toHaveBeenCalledWith('username2', { temporary : true });
 
 		});
 
 		it('should pass temporariness only for specified profile', async () => {
 			await original.login('username1', { temporary : true });
 
-			expect(auth.getAuth).toBeCalledWith('username1', { temporary : true });
-			expect(auth.getAuth).not.toBeCalledWith('username2', { temporary : true });
+			expect(auth.getAuth).toHaveBeenCalledWith('username1', { temporary : true });
+			expect(auth.getAuth).not.toHaveBeenCalledWith('username2', { temporary : true });
 
 		});
 
 		it('should show auth progress for all profiles by default', async () => {
 			await original.login();
 
-			expect(logger.warn).toBeCalledWith('username1 - logging in...');
-			expect(logger.warn).toBeCalledWith('username2 - logging in...');
-			expect(logger.info).toBeCalledWith('username1 - logged in successfully');
-			expect(logger.info).toBeCalledWith('username2 - logged in successfully');
+			expect(logger.warn).toHaveBeenCalledWith('username1 - logging in...');
+			expect(logger.warn).toHaveBeenCalledWith('username2 - logging in...');
+			expect(logger.info).toHaveBeenCalledWith('username1 - logged in successfully');
+			expect(logger.info).toHaveBeenCalledWith('username2 - logged in successfully');
 		});
 
 		it('should show auth progress for specified profile by default', async () => {
 			await original.login('username1');
 
-			expect(logger.warn).toBeCalledWith('username1 - logging in...');
-			expect(logger.info).toBeCalledWith('username1 - logged in successfully');
+			expect(logger.warn).toHaveBeenCalledWith('username1 - logging in...');
+			expect(logger.info).toHaveBeenCalledWith('username1 - logged in successfully');
 		});
 
 		it('should not show auth progress if hidden', async () => {
 			await original.login(undefined, { hideProgress : true });
 			await original.login('username1', { hideProgress : true });
 
-			expect(logger.info).not.toBeCalled();
+			expect(logger.info).not.toHaveBeenCalled();
 		});
 	});
 
 	describe('getAuth', () => {
 		it('should get secrets', async () => {
 			await original.getAuth(profile);
-			expect(secrets.getSecrets).toBeCalledWith(profile);
+			expect(secrets.getSecrets).toHaveBeenCalledWith(profile);
 		});
 
 		it('should get credentials', async () => {
 			await original.getAuth(profile);
-			expect(secrets.getCredentials).toBeCalledWith(profile, googleAuth, undefined);
+			expect(secrets.getCredentials).toHaveBeenCalledWith(profile, googleAuth, undefined);
 		});
 
 		it('should create OAuth2 instance', async () => {
 			await original.getAuth(profile);
-			expect(google.auth.OAuth2).toBeCalledWith(secretsObject.web.client_id, secretsObject.web.client_secret, secretsObject.web.redirect_uris[0]);
+			expect(google.auth.OAuth2).toHaveBeenCalledWith(secretsObject.web.client_id, secretsObject.web.client_secret, secretsObject.web.redirect_uris[0]);
 		});
 
 		it('should set credentials', async () => {
 			await original.getAuth(profile);
-			expect(googleAuth.setCredentials).toBeCalledWith(credentials);
+			expect(googleAuth.setCredentials).toHaveBeenCalledWith(credentials);
 		});
 
 		it('should pass temporariness', async () => {
 			await original.getAuth(profile, { temporary : true });
 
-			expect(secrets.getCredentials).toBeCalledWith(profile, googleAuth, { temporary : true });
+			expect(secrets.getCredentials).toHaveBeenCalledWith(profile, googleAuth, { temporary : true });
 		});
 
 		it('should set google auth', async () => {
 			await original.getAuth(profile);
 
-			expect(google.options).toBeCalledWith({ auth : googleAuth });
+			expect(google.options).toHaveBeenCalledWith({ auth : googleAuth });
 		});
 	});
 });

package/src/lib/__tests__/jsonLib.test.ts

@@ -1,5 +1,4 @@
 import fs from 'fs';
-import logger from '../logger';
 import paths from '../paths';
 
 import jsonLib from '../jsonLib';
@@ -18,12 +17,6 @@ jest.mock<Partial<typeof fs>>('fs', () => ({
 	existsSync    : jest.fn().mockImplementation(() => fileExists),
 }));
 
-jest.mock<Partial<typeof logger>>('../logger', () => ({
-	error : jest.fn().mockImplementation((error) => {
-		throw error;
-	}) as jest.Mock<never, any>,
-}));
-
 jest.mock<Partial<typeof paths>>('../paths', () => ({
 	ensureFile : jest.fn(),
 }));
@@ -47,7 +40,7 @@ describe('src/lib/jsonLib', () => {
 		it('should read specified file', () => {
 			original.readJSON(filename);
 
-			expect(fs.readFileSync).toBeCalledWith(filename);
+			expect(fs.readFileSync).toHaveBeenCalledWith(filename);
 		});
 
 		it('should return parsed JSON', () => {
@@ -61,7 +54,7 @@ describe('src/lib/jsonLib', () => {
 		it('should write JSON into specified file', () => {
 			original.writeJSON(filename, json);
 
-			expect(fs.writeFileSync).toBeCalledWith(filename, jsonString);
+			expect(fs.writeFileSync).toHaveBeenCalledWith(filename, jsonString);
 		});
 	});
 
@@ -73,8 +66,8 @@ describe('src/lib/jsonLib', () => {
 
 			original.getJSON(filename, createCallback, validateCallback);
 
-			expect(jsonLib.readJSON).toBeCalledWith(filename);
-			expect(createCallback).not.toBeCalled();
+			expect(jsonLib.readJSON).toHaveBeenCalledWith(filename);
+			expect(createCallback).not.toHaveBeenCalled();
 		});
 
 		it('should call createCallback if file exists but json is not valid', () => {
@@ -83,8 +76,8 @@ describe('src/lib/jsonLib', () => {
 
 			original.getJSON(filename, createCallback, validateCallback);
 
-			expect(jsonLib.readJSON).toBeCalledWith(filename);
-			expect(createCallback).toBeCalledWith();
+			expect(jsonLib.readJSON).toHaveBeenCalledWith(filename);
+			expect(createCallback).toHaveBeenCalledWith();
 		});
 
 		it('should call createCallback if file not exists', () => {
@@ -92,8 +85,8 @@ describe('src/lib/jsonLib', () => {
 
 			original.getJSON(filename, createCallback, validateCallback);
 
-			expect(jsonLib.readJSON).not.toBeCalled();
-			expect(createCallback).toBeCalledWith();
+			expect(jsonLib.readJSON).not.toHaveBeenCalled();
+			expect(createCallback).toHaveBeenCalledWith();
 		});
 
 		it('should not write fallback JSON back if file exists and json is valid', () => {
@@ -102,7 +95,7 @@ describe('src/lib/jsonLib', () => {
 
 			original.getJSON(filename, createCallback, validateCallback);
 
-			expect(jsonLib.writeJSON).not.toBeCalled();
+			expect(jsonLib.writeJSON).not.toHaveBeenCalled();
 		});
 
 		it('should write fallback JSON back if file exists but json is not valid', () => {
@@ -111,9 +104,9 @@ describe('src/lib/jsonLib', () => {
 
 			original.getJSON(filename, createCallback, validateCallback);
 
-			expect(jsonLib.checkJSON).toBeCalledWith(filename, fallbackJSON);
-			expect(paths.ensureFile).toBeCalledWith(filename);
-			expect(jsonLib.writeJSON).toBeCalledWith(filename, fallbackJSON);
+			expect(jsonLib.checkJSON).toHaveBeenCalledWith(filename, fallbackJSON);
+			expect(paths.ensureFile).toHaveBeenCalledWith(filename);
+			expect(jsonLib.writeJSON).toHaveBeenCalledWith(filename, fallbackJSON);
 		});
 
 		it('should write fallback JSON back if file not exists', () => {
@@ -121,9 +114,9 @@ describe('src/lib/jsonLib', () => {
 
 			original.getJSON(filename, createCallback, validateCallback);
 
-			expect(jsonLib.checkJSON).toBeCalledWith(filename, fallbackJSON);
-			expect(paths.ensureFile).toBeCalledWith(filename);
-			expect(jsonLib.writeJSON).toBeCalledWith(filename, fallbackJSON);
+			expect(jsonLib.checkJSON).toHaveBeenCalledWith(filename, fallbackJSON);
+			expect(paths.ensureFile).toHaveBeenCalledWith(filename);
+			expect(jsonLib.writeJSON).toHaveBeenCalledWith(filename, fallbackJSON);
 		});
 
 		it('should return JSON if file exists and json is valid', () => {
@@ -160,8 +153,8 @@ describe('src/lib/jsonLib', () => {
 
 			await original.getJSONAsync(filename, createCallbackAsync, validateCallbackAsync);
 
-			expect(jsonLib.readJSON).toBeCalledWith(filename);
-			expect(createCallbackAsync).not.toBeCalled();
+			expect(jsonLib.readJSON).toHaveBeenCalledWith(filename);
+			expect(createCallbackAsync).not.toHaveBeenCalled();
 		});
 
 		it('should call createCallback if file exists but json is not valid', async () => {
@@ -170,8 +163,8 @@ describe('src/lib/jsonLib', () => {
 
 			await original.getJSONAsync(filename, createCallbackAsync, validateCallbackAsync);
 
-			expect(jsonLib.readJSON).toBeCalledWith(filename);
-			expect(createCallbackAsync).toBeCalledWith();
+			expect(jsonLib.readJSON).toHaveBeenCalledWith(filename);
+			expect(createCallbackAsync).toHaveBeenCalledWith();
 		});
 
 		it('should call createCallback if file not exists', async () => {
@@ -179,8 +172,8 @@ describe('src/lib/jsonLib', () => {
 
 			await original.getJSONAsync(filename, createCallbackAsync, validateCallbackAsync);
 
-			expect(jsonLib.readJSON).not.toBeCalled();
-			expect(createCallbackAsync).toBeCalledWith();
+			expect(jsonLib.readJSON).not.toHaveBeenCalled();
+			expect(createCallbackAsync).toHaveBeenCalledWith();
 		});
 
 		it('should not write fallback JSON back if file exists and json is valid', async () => {
@@ -189,7 +182,7 @@ describe('src/lib/jsonLib', () => {
 
 			await original.getJSONAsync(filename, createCallbackAsync, validateCallbackAsync);
 
-			expect(jsonLib.writeJSON).not.toBeCalled();
+			expect(jsonLib.writeJSON).not.toHaveBeenCalled();
 		});
 
 		it('should write fallback JSON back if file exists but json is not valid', async () => {
@@ -198,9 +191,9 @@ describe('src/lib/jsonLib', () => {
 
 			await original.getJSONAsync(filename, createCallbackAsync, validateCallbackAsync);
 
-			expect(jsonLib.checkJSON).toBeCalledWith(filename, fallbackJSON);
-			expect(paths.ensureFile).toBeCalledWith(filename);
-			expect(jsonLib.writeJSON).toBeCalledWith(filename, fallbackJSON);
+			expect(jsonLib.checkJSON).toHaveBeenCalledWith(filename, fallbackJSON);
+			expect(paths.ensureFile).toHaveBeenCalledWith(filename);
+			expect(jsonLib.writeJSON).toHaveBeenCalledWith(filename, fallbackJSON);
 		});
 
 		it('should write fallback JSON back if file not exists', async () => {
@@ -208,9 +201,9 @@ describe('src/lib/jsonLib', () => {
 
 			await original.getJSONAsync(filename, createCallbackAsync, validateCallbackAsync);
 
-			expect(jsonLib.checkJSON).toBeCalledWith(filename, fallbackJSON);
-			expect(paths.ensureFile).toBeCalledWith(filename);
-			expect(jsonLib.writeJSON).toBeCalledWith(filename, fallbackJSON);
+			expect(jsonLib.checkJSON).toHaveBeenCalledWith(filename, fallbackJSON);
+			expect(paths.ensureFile).toHaveBeenCalledWith(filename);
+			expect(jsonLib.writeJSON).toHaveBeenCalledWith(filename, fallbackJSON);
 		});
 
 		it('should return JSON if file exists and json is valid', async () => {
@@ -241,13 +234,12 @@ describe('src/lib/jsonLib', () => {
 	});
 
 	describe('checkJSON', () => {
-		it('should do nothing if json is truthy', () => {
-			original.checkJSON(filename, json);
-
-			expect(logger.error).not.toBeCalled();
-		});
 		it('should output error if json is falsy', () => {
-			expect(() => original.checkJSON(filename, '')).toThrowError(`File ${filename} doesn't exist and should be created with initial data, but function createCallback returned nothing`);
+			expect(() => original.checkJSON(filename, '')).toThrow(`File ${filename} doesn't exist and should be created with initial data, but function createCallback returned nothing`);
+		});
+
+		it('should do nothing if json is truthy', () => {
+			expect(() => original.checkJSON(filename, json)).not.toThrow();
 		});
 	});
 });

package/src/lib/__tests__/paths.test.ts

@@ -42,7 +42,7 @@ describe('src/lib/paths', () => {
 
 			original.ensureDir(dirPath);
 
-			expect(fs.mkdirSync).toBeCalledWith(dirPath, { recursive : true });
+			expect(fs.mkdirSync).toHaveBeenCalledWith(dirPath, { recursive : true });
 		});
 
 		it('should not create empty dir if already exists', () => {
@@ -50,7 +50,7 @@ describe('src/lib/paths', () => {
 
 			original.ensureDir(dirPath);
 
-			expect(fs.writeFileSync).not.toBeCalled();
+			expect(fs.writeFileSync).not.toHaveBeenCalled();
 		});
 
 		it('should return dirPath', () => {
@@ -66,7 +66,7 @@ describe('src/lib/paths', () => {
 
 			original.ensureFile(filePath);
 
-			expect(paths.ensureDir).toBeCalledWith('parentDir');
+			expect(paths.ensureDir).toHaveBeenCalledWith('parentDir');
 		});
 
 		it('should create empty file if not exists', () => {
@@ -74,7 +74,7 @@ describe('src/lib/paths', () => {
 
 			original.ensureFile(filePath);
 
-			expect(fs.writeFileSync).toBeCalledWith(filePath, '');
+			expect(fs.writeFileSync).toHaveBeenCalledWith(filePath, '');
 		});
 
 		it('should not create empty file if already exists', () => {
@@ -82,7 +82,7 @@ describe('src/lib/paths', () => {
 
 			original.ensureFile(filePath);
 
-			expect(fs.writeFileSync).not.toBeCalled();
+			expect(fs.writeFileSync).not.toHaveBeenCalled();
 		});
 
 		it('should return filePath', () => {

package/src/lib/__tests__/profiles.test.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
+import logger from '@anmiles/logger';
 import jsonLib from '../jsonLib';
-import logger from '../logger';
 import paths from '../paths';
 
 import profiles from '../profiles';
@@ -23,12 +23,9 @@ jest.mock<Partial<typeof jsonLib>>('../jsonLib', () => ({
 	writeJSON : jest.fn(),
 }));
 
-jest.mock<Partial<typeof logger>>('../logger', () => ({
-	log   : jest.fn(),
-	warn  : jest.fn(),
-	error : jest.fn().mockImplementation((error) => {
-		throw error;
-	}) as jest.Mock<never, any>,
+jest.mock<Partial<typeof logger>>('@anmiles/logger', () => ({
+	log  : jest.fn(),
+	warn : jest.fn(),
 }));
 
 jest.mock<Partial<typeof paths>>('../paths', () => ({
@@ -56,7 +53,7 @@ describe('src/lib/profiles', () => {
 		it('should get json from profiles file', () => {
 			original.getProfiles();
 
-			expect(getJSONSpy).toBeCalled();
+			expect(getJSONSpy).toHaveBeenCalled();
 			expect(getJSONSpy.mock.calls[0][0]).toEqual(profilesFile);
 		});
 
@@ -79,7 +76,7 @@ describe('src/lib/profiles', () => {
 		it('should write json to profiles file', () => {
 			original.setProfiles(allProfiles);
 
-			expect(jsonLib.writeJSON).toBeCalledWith(profilesFile, allProfiles);
+			expect(jsonLib.writeJSON).toHaveBeenCalledWith(profilesFile, allProfiles);
 		});
 	});
 
@@ -87,7 +84,7 @@ describe('src/lib/profiles', () => {
 		it('should output error and do nothing if profile is falsy', () => {
 			const func = () => original.createProfile('');
 
-			expect(func).toThrowError('Usage: `npm run create <profile>` where `profile` - is any profile name you want');
+			expect(func).toThrow('Usage: `npm run create <profile>` where `profile` - is any profile name you want');
 		});
 
 		it('should get profiles', () => {
@@ -95,7 +92,7 @@ describe('src/lib/profiles', () => {
 
 			original.createProfile(newProfile);
 
-			expect(profiles.getProfiles).toBeCalledWith();
+			expect(profiles.getProfiles).toHaveBeenCalledWith();
 		});
 
 		it('should not save profiles if profile already exists', () => {
@@ -103,7 +100,7 @@ describe('src/lib/profiles', () => {
 
 			original.createProfile(newProfile);
 
-			expect(profiles.setProfiles).not.toBeCalled();
+			expect(profiles.setProfiles).not.toHaveBeenCalled();
 		});
 
 		it('should add new profile if not exists', () => {
@@ -111,7 +108,7 @@ describe('src/lib/profiles', () => {
 
 			original.createProfile(newProfile);
 
-			expect(profiles.setProfiles).toBeCalledWith([ 'username1', 'username2', 'newProfile' ]);
+			expect(profiles.setProfiles).toHaveBeenCalledWith([ 'username1', 'username2', 'newProfile' ]);
 		});
 	});
 });