diff --git a/app/index.js b/app/index.js index 1037ff8..6ec0384 100644 --- a/app/index.js +++ b/app/index.js @@ -490,7 +490,7 @@ async function loginF95(browser, username, password) { page.click(selectors.LOGIN_BUTTON), // Click on the login button page.waitForNavigation({ waitUntil: shared.WAIT_STATEMENT - }), // Wait for page to load + }) // Wait for page to load ]); // Prepare result diff --git a/app/scripts/game-searcher.js b/app/scripts/game-searcher.js index fde774e..4063149 100644 --- a/app/scripts/game-searcher.js +++ b/app/scripts/game-searcher.js @@ -37,7 +37,7 @@ module.exports.getSearchGameResults = async function (browser, gamename) { page.click(selectors.SEARCH_BUTTON), // Execute search page.waitForNavigation({ waitUntil: shared.WAIT_STATEMENT - }), // Wait for page to load + }) // Wait for page to load ]); // Select all conversation titles diff --git a/test/index-test.js b/test/index-test.js index 74b312b..1ed0799 100644 --- a/test/index-test.js +++ b/test/index-test.js @@ -1,19 +1,19 @@ -"use strict"; +'use strict'; -const expect = require("chai").expect; -const F95API = require("../app/index"); -const fs = require("fs"); -const sleep = require("sleep"); -const dotenv = require("dotenv"); +const expect = require('chai').expect; +const F95API = require('../app/index'); +const fs = require('fs'); +const sleep = require('sleep'); +const dotenv = require('dotenv'); dotenv.config(); -const COOKIES_SAVE_PATH = "./f95cache/cookies.json"; -const ENGINES_SAVE_PATH = "./f95cache/engines.json"; -const STATUSES_SAVE_PATH = "./f95cache/statuses.json"; +const COOKIES_SAVE_PATH = './f95cache/cookies.json'; +const ENGINES_SAVE_PATH = './f95cache/engines.json'; +const STATUSES_SAVE_PATH = './f95cache/statuses.json'; const USERNAME = process.env.F95_USERNAME; const PASSWORD = process.env.F95_PASSWORD; -const FAKE_USERNAME = "FakeUsername091276"; -const FAKE_PASSWORD = "fake_password"; +const FAKE_USERNAME = 'FakeUsername091276'; +const FAKE_PASSWORD = 'fake_password'; F95API.debug(false); @@ -22,15 +22,15 @@ function randomSleep() { sleep.msleep(500 + random); } -describe("Login without cookies", function () { +describe('Login without cookies', function () { //#region Set-up this.timeout(30000); // All tests in this suite get 30 seconds before timeout - before("Set isolation", function () { + before('Set isolation', function () { F95API.setIsolation(true); }); - beforeEach("Remove all cookies", function () { + beforeEach('Remove all cookies', function () { // Runs before each test in this block if (fs.existsSync(COOKIES_SAVE_PATH)) fs.unlinkSync(COOKIES_SAVE_PATH); if (F95API.isLogged()) F95API.logout(); @@ -39,53 +39,53 @@ describe("Login without cookies", function () { let testOrder = 0; - it("Test with valid credentials", async function () { + it('Test with valid credentials', async function () { // Gain exclusive use of the cookies while (testOrder !== 0) randomSleep(); const result = await F95API.login(USERNAME, PASSWORD); expect(result.success).to.be.true; - expect(result.message).equal("Authentication successful"); + expect(result.message).equal('Authentication successful'); testOrder = 1; }); - it("Test with invalid username", async function () { + it('Test with invalid username', async function () { // Gain exclusive use of the cookies while (testOrder !== 1) randomSleep(); const result = await F95API.login(FAKE_USERNAME, FAKE_PASSWORD); expect(result.success).to.be.false; - expect(result.message).to.equal("Incorrect username"); + expect(result.message).to.equal('Incorrect username'); testOrder = 2; }); - it("Test with invalid password", async function () { + it('Test with invalid password', async function () { // Gain exclusive use of the cookies while (testOrder !== 2) randomSleep(); const result = await F95API.login(USERNAME, FAKE_PASSWORD); expect(result.success).to.be.false; - expect(result.message).to.equal("Incorrect password"); + expect(result.message).to.equal('Incorrect password'); testOrder = 3; }); - it("Test with invalid credentials", async function () { + it('Test with invalid credentials', async function () { // Gain exclusive use of the cookies while (testOrder !== 3) randomSleep(); const result = await F95API.login(FAKE_USERNAME, FAKE_PASSWORD); expect(result.success).to.be.false; - expect(result.message).to.equal("Incorrect username"); // It should first check the username + expect(result.message).to.equal('Incorrect username'); // It should first check the username testOrder = 4; }); }); -describe("Login with cookies", function () { +describe('Login with cookies', function () { //#region Set-up this.timeout(30000); // All tests in this suite get 30 seconds before timeout - before("Log in to create cookies then logout", async function () { + before('Log in to create cookies then logout', async function () { // Runs once before the first test in this block if (!fs.existsSync(COOKIES_SAVE_PATH)) await F95API.login(USERNAME, PASSWORD); // Download cookies @@ -93,25 +93,25 @@ describe("Login with cookies", function () { }); //#endregion Set-up - it("Test with valid credentials", async function () { + it('Test with valid credentials', async function () { const result = await F95API.login(USERNAME, PASSWORD); expect(result.success).to.be.true; - expect(result.message).equal("Logged with cookies"); + expect(result.message).equal('Logged with cookies'); }); }); -describe("Load base data without cookies", function () { +describe('Load base data without cookies', function () { //#region Set-up this.timeout(30000); // All tests in this suite get 30 seconds before timeout - before("Delete cache if exists", function () { + before('Delete cache if exists', function () { // Runs once before the first test in this block if (fs.existsSync(ENGINES_SAVE_PATH)) fs.unlinkSync(ENGINES_SAVE_PATH); if (fs.existsSync(STATUSES_SAVE_PATH)) fs.unlinkSync(STATUSES_SAVE_PATH); }); //#endregion Set-up - it("With login", async function () { + it('With login', async function () { const loginResult = await F95API.login(USERNAME, PASSWORD); expect(loginResult.success).to.be.true; @@ -125,24 +125,24 @@ describe("Load base data without cookies", function () { expect(statusesCacheExists).to.be.true; }); - it("Without login", async function () { + it('Without login', async function () { if (F95API.isLogged()) F95API.logout(); const result = await F95API.loadF95BaseData(); expect(result).to.be.false; }); }); -describe("Search game data", function () { +describe('Search game data', function () { //#region Set-up this.timeout(60000); // All tests in this suite get 60 seconds before timeout - beforeEach("Prepare API", function () { + beforeEach('Prepare API', function () { // Runs once before the first test in this block if (F95API.isLogged()) F95API.logout(); }); //#endregion Set-up - it("Search game when logged", async function () { + it('Search game when logged', async function () { const loginResult = await F95API.login(USERNAME, PASSWORD); expect(loginResult.success).to.be.true; @@ -151,30 +151,30 @@ describe("Search game data", function () { // This test depend on the data on F95Zone at // https://f95zone.to/threads/kingdom-of-deception-v0-10-8-hreinn-games.2733/ - const gamesList = await F95API.getGameData("Kingdom of Deception", false); - expect(gamesList.length, "Should find only the game").to.equal(1); + const gamesList = await F95API.getGameData('Kingdom of Deception', false); + expect(gamesList.length, 'Should find only the game').to.equal(1); const result = gamesList[0]; - const src = "https://attachments.f95zone.to/2018/09/162821_f9nXfwF.png"; + const src = 'https://attachments.f95zone.to/2018/09/162821_f9nXfwF.png'; // Test only the main information - expect(result.name).to.equal("Kingdom of Deception"); - expect(result.author).to.equal("Hreinn Games"); - expect(result.isMod, "Should be false").to.be.false; - expect(result.engine).to.equal("REN'PY"); + expect(result.name).to.equal('Kingdom of Deception'); + expect(result.author).to.equal('Hreinn Games'); + expect(result.isMod, 'Should be false').to.be.false; + expect(result.engine).to.equal('REN\'PY'); expect(result.previewSource).to.equal(src); // Could be null -> Why sometimes doesn't get the image? }); - it("Search game when not logged", async function () { - const result = await F95API.getGameData("Kingdom of Deception", false); - expect(result, "Without being logged should return null").to.be.null; + it('Search game when not logged', async function () { + const result = await F95API.getGameData('Kingdom of Deception', false); + expect(result, 'Without being logged should return null').to.be.null; }); }); -describe("Load user data", function () { +describe('Load user data', function () { //#region Set-up this.timeout(30000); // All tests in this suite get 30 seconds before timeout //#endregion Set-up - it("Retrieve when logged", async function () { + it('Retrieve when logged', async function () { // Login await F95API.login(USERNAME, PASSWORD); @@ -184,7 +184,7 @@ describe("Load user data", function () { expect(data).to.exist; expect(data.username).to.equal(USERNAME); }); - it("Retrieve when not logged", async function () { + it('Retrieve when not logged', async function () { // Logout if (F95API.isLogged()) F95API.logout(); @@ -195,12 +195,12 @@ describe("Load user data", function () { }); }); -describe("Check game update", function () { +describe('Check game update', function () { //#region Set-up this.timeout(30000); // All tests in this suite get 30 seconds before timeout //#endregion Set-up - it("Get online game and verify that no update exists", async function () { + it('Get online game and verify that no update exists', async function () { const loginResult = await F95API.login(USERNAME, PASSWORD); expect(loginResult.success).to.be.true; @@ -209,22 +209,22 @@ describe("Check game update", function () { // This test depend on the data on F95Zone at // https://f95zone.to/threads/kingdom-of-deception-v0-10-8-hreinn-games.2733/ - const result = (await F95API.getGameData("Kingdom of Deception", false))[0]; + const result = (await F95API.getGameData('Kingdom of Deception', false))[0]; const update = await F95API.chekIfGameHasUpdate(result); expect(update).to.be.false; }); - it("Verify that update exists from old URL", async function () { + it('Verify that update exists from old URL', async function () { const loginResult = await F95API.login(USERNAME, PASSWORD); expect(loginResult.success).to.be.true; // This test depend on the data on F95Zone at // https://f95zone.to/threads/perverted-education-v0-9701-april-ryan.1854/ const url = - "https://f95zone.to/threads/perverted-education-v0-9701-april-ryan.1854/"; + 'https://f95zone.to/threads/perverted-education-v0-9701-april-ryan.1854/'; const result = await F95API.getGameDataFromURL(url); - result.version = "0.9600"; + result.version = '0.9600'; const update = await F95API.chekIfGameHasUpdate(result); expect(update).to.be.true; diff --git a/test/user-test.js b/test/user-test.js index 90692cd..5a7b798 100644 --- a/test/user-test.js +++ b/test/user-test.js @@ -1,4 +1,4 @@ -const { join } = require("path"); +const { join } = require('path'); const { debug, login, @@ -6,19 +6,19 @@ const { loadF95BaseData, getUserData, logout -} = require("../app/index.js"); -const GameDownload = require("../app/scripts/classes/game-download.js"); +} = require('../app/index.js'); +const GameDownload = require('../app/scripts/classes/game-download.js'); debug(true); main(); //downloadGameMEGA(); async function main() { - const loginResult = await login("MillenniumEarl", "f9vTcRNuvxj4YpK"); + const loginResult = await login('MillenniumEarl', 'f9vTcRNuvxj4YpK'); if (loginResult.success) { await loadF95BaseData(); - const gameData = await getGameData("queen's brothel", false); + const gameData = await getGameData('queen\'s brothel', false); console.log(gameData); // let userData = await getUserData(); @@ -29,10 +29,10 @@ async function main() { async function downloadGameMEGA() { const gd = new GameDownload(); - gd.hosting = "NOPY"; + gd.hosting = 'NOPY'; gd.link = - "https://f95zone.to/masked/mega.nz/2733/1470797/4O5LKwMx4ZSlw0QYTVMP0uDK660/hoobTb44f0IKx7Yio2SE2w/loX_px2vLRyNRQCnkNn5U7nnQe7jGmpEVERvH1tk7RjAFkQbs2kH_vCK6zVmRDuqiypPoIx358MNHHCd3QCdVvEsClSiAq4rwjK0r_ruXIs"; - const savepath = join(__dirname, "Kingdom_of_Deception-pc0.10.8.zip"); + 'https://f95zone.to/masked/mega.nz/2733/1470797/4O5LKwMx4ZSlw0QYTVMP0uDK660/hoobTb44f0IKx7Yio2SE2w/loX_px2vLRyNRQCnkNn5U7nnQe7jGmpEVERvH1tk7RjAFkQbs2kH_vCK6zVmRDuqiypPoIx358MNHHCd3QCdVvEsClSiAq4rwjK0r_ruXIs'; + const savepath = join(__dirname, 'Kingdom_of_Deception-pc0.10.8.zip'); const result = await gd.download(savepath); console.log(result); }