fix: failed UTs

Author: kobenguyent

docs/data.md

@@ -92,11 +92,7 @@ I.sendPostRequest('/update-status', {}, { http_x_requested_with: 'xmlhttprequest
 ## GraphQL
 
 [GraphQL helper](https://codecept.io/helpers/GraphQL/) allows sending GraphQL queries and mutations to application, over Http.
-<<<<<<< HEAD
 This is a tool to make shortcuts and create your data pragmatically via GraphQL endpoint. However, it doesn't provide tools for testing the endpoint, so it should be paired with WebDriver helper for browser testing.
-=======
-This is a tool to make shortcuts and create your data pragmatically via GraphQL endpoint. However, it doesn't provide tools for testing the endpoint, so it should be paired with WebDriver helpers for browser testing.
->>>>>>> 3.x
 
 Enable GraphQL helper in the config. It is recommended to set `endpoint`, the URL to which the requests go to. If you need some authorization you can optionally set default headers too.
 

lib/ai.cjs renamed to lib/ai.js

@@ -1,7 +1,9 @@
-const debug = require('debug')('codeceptjs:ai');
-const output = require('./output.js');
-const event = require('./event');
-const { removeNonInteractiveElements, minifyHtml, splitByChunks } = require('./html');
+import debug from 'debug';
+import * as event from './event.js';
+import * as output from './output.js';
+import { removeNonInteractiveElements, minifyHtml, splitByChunks } from './html.js';
+
+debug('codeceptjs:ai');
 
 const defaultHtmlConfig = {
   maxLength: 50000,
@@ -250,5 +252,4 @@ function parseCodeBlocks(response) {
   return modifiedSnippets.filter(snippet => !!snippet);
 }
 
-module.exports = new AiAssistant();
-
+export default new AiAssistant();

lib/command/run-workers.js

@@ -1,14 +1,6 @@
 // For Node version >=10.5.0, have to use experimental flag
-<<<<<<< HEAD
 import { tryOrDefault } from '../utils.js';
-=======
-const { tryOrDefault } = require('../utils');
-const output = require('../output');
-const store = require('../store');
-const event = require('../event');
-const Workers = require('../workers');
->>>>>>> 4.x
-
+import { store } from '../store.js';
 import * as output from '../output.js';
 import * as event from '../event.js';
 import { Workers } from '../workers.js';

lib/command/run.js

@@ -1,16 +1,10 @@
 import importSync from 'import-sync';
 import {
   getConfig, printError, getTestRoot, createOutputDir,
-<<<<<<< HEAD
 } from './utils.js';
 import Config from '../config.js';
 import Codecept from '../codecept.js';
-=======
-} = require('./utils');
-const Config = require('../config');
-const store = require('../store');
-const Codecept = require('../codecept');
->>>>>>> 4.x
+import { store } from '../store.js';
 
 export default async function (test, options) {
   // registering options globally to use in config

lib/container.js

@@ -15,7 +15,7 @@ import * as WorkerStorage from './workerStorage.js';
 import { store } from './store.js';
 import { actor } from './actor.js';
 
-const ai = require('./ai.cjs');
+import ai from './ai.js';
 
 let container = {
   helpers: {},

lib/heal.js

@@ -1,9 +1,13 @@
-const debug = require('debug')('codeceptjs:heal');
-const colors = require('chalk');
-const Container = require('./container');
-const recorder = require('./recorder');
-const output = require('./output');
-const event = require('./event');
+import debug from 'debug';
+import colors from 'chalk';
+import Container from './container.js';
+import recorder from './recorder.js';
+import * as event from './event.js';
+import { output } from './output.js';
+
+const logger = debug('myapp:server');
+
+logger('codeceptjs:heal');
 
 /**
  * @class
@@ -57,7 +61,7 @@ class Heal {
     const suggestions = [];
     const recipes = matchRecipes(this.recipes, this.contextName);
 
-    debug('Recipes', recipes);
+    logger('Recipes', recipes);
 
     const currentOutputLevel = output.level();
     output.level(0);
@@ -96,20 +100,20 @@ class Heal {
     const suggestions = await this.getCodeSuggestions(failureContext);
 
     if (suggestions.length === 0) {
-      debug('No healing suggestions found');
+      logger('No healing suggestions found');
       throw error;
     }
 
     output.debug(`Received ${suggestions.length} suggestion${suggestions.length === 1 ? '' : 's'}`);
 
-    debug(suggestions);
+    logger(suggestions);
 
     for (const suggestion of suggestions) {
       for (const codeSnippet of suggestion.snippets) {
         try {
-          debug('Executing', codeSnippet);
+          logger('Executing', codeSnippet);
           recorder.catch((e) => {
-            debug(e);
+            logger(e);
           });
 
           if (typeof codeSnippet === 'string') {
@@ -131,7 +135,7 @@ class Heal {
           // recorder.session.restore();
           return;
         } catch (err) {
-          debug('Failed to execute code', err);
+          logger('Failed to execute code', err);
           recorder.ignoreErr(err); // healing did not help
           recorder.catchWithoutStop(err);
           await recorder.promise(); // wait for all promises to resolve
@@ -149,7 +153,7 @@ class Heal {
 
 const heal = new Heal();
 
-module.exports = heal;
+export { heal };
 
 function matchRecipes(recipes, contextName) {
   return Object.entries(recipes)

lib/helper/AI.js

@@ -1,16 +1,8 @@
-<<<<<<< HEAD:lib/helper/OpenAI.js
 import Helper from '@codeceptjs/helper';
-import AiAssistant from '../ai.cjs';
+import AiAssistant from '../ai.js';
 import standardActingHelpers from '../plugin/standardActingHelpers.js';
 import Container from '../container.js';
-import { splitByChunks, minifyHtml } from '../html';
-=======
-const Helper = require('@codeceptjs/helper');
-const ai = require('../ai.cjs');
-const standardActingHelpers = require('../plugin/standardActingHelpers');
-const Container = require('../container');
-const { splitByChunks, minifyHtml } = require('../html');
->>>>>>> 4.x:lib/helper/AI.js
+import { splitByChunks, minifyHtml } from '../html.js';
 
 /**
  * AI Helper for CodeceptJS.
@@ -27,7 +19,7 @@ const { splitByChunks, minifyHtml } = require('../html');
 class AI extends Helper {
   constructor(config) {
     super(config);
-    this.aiAssistant = ai;
+    this.aiAssistant = AiAssistant;
 
     this.options = {
       chunkSize: 80000,
@@ -129,8 +121,4 @@ class AI extends Helper {
   }
 }
 
-<<<<<<< HEAD:lib/helper/OpenAI.js
-export default OpenAI;
-=======
-module.exports = AI;
->>>>>>> 4.x:lib/helper/AI.js
+export default AI;

lib/index.js

@@ -13,6 +13,8 @@ import * as container from './container.js';
 import * as locator from './locator.js';
 import * as event from './event.js';
 import * as store from './store.js';
+import * as heal from './heal.js';
+import * as ai from './ai.js';
 /**
  * Index file for loading CodeceptJS programmatically.
  *
@@ -54,7 +56,7 @@ export {
   store,
   /** @type {typeof CodeceptJS.Locator} */
   locator,
-  heal: require('./heal.js'),
-  ai: require('./ai.cjs'),
-  Workers
+  heal,
+  ai,
+  workers,
 };

lib/pause.js

@@ -6,7 +6,7 @@ import debug from 'debug';
 import container from './container.js';
 import history from './history.js';
 import { store } from './store.js';
-import AiAssistant from './ai.cjs';
+import AiAssistant from './ai.js';
 import recorder from './recorder.js';
 import * as event from './event.js';
 import * as output from './output.js';

lib/plugin/heal.js

@@ -1,7 +1,7 @@
 import debug from 'debug';
 import colors from 'chalk';
 import Container from '../container.js';
-import AiAssistant from '../ai.cjs';
+import AiAssistant from '../ai.js';
 import recorder from '../recorder.js';
 import * as event from '../event.js';
 import * as output from '../output.js';