fixed more tests

Author: DavertMik

test/helper/AppiumWeb_test.js

@@ -1,5 +1,6 @@
-const Appium = require('../../lib/helper/Appium')
-global.codeceptjs = require('../../lib')
+import { Appium } from '../../lib/helper/Appium.js'
+import * as codeceptjs from '../../lib/index.js'
+global.codeceptjs = codeceptjs.default || codeceptjs
 
 let I
 const site_url = 'http://davertmik.github.io'

test/helper/Appium_ios_test.js

@@ -1,13 +1,19 @@
-const chai = require('chai')
+import chai from 'chai'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import { dirname } from 'path'
+
+import { Appium } from '../../lib/helper/Appium.js'
+import AssertionFailedError from '../../lib/assert/error.js'
+import { fileExists } from '../../lib/utils.js'
+import * as codeceptjs from '../../lib/index.js'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
 
 const expect = chai.expect
 const assert = chai.assert
-const path = require('path')
-
-const Appium = require('../../lib/helper/Appium')
-const AssertionFailedError = require('../../lib/assert/error')
-const fileExists = require('../../lib/utils').fileExists
-global.codeceptjs = require('../../lib')
+global.codeceptjs = codeceptjs.default || codeceptjs
 
 let app
 // iOS test app is built from https://github.com/appium/ios-test-app and uploaded to Saucelabs

test/helper/Appium_test.js

@@ -1,13 +1,19 @@
-const chai = require('chai')
+import chai from 'chai'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import { dirname } from 'path'
+
+import { Appium } from '../../lib/helper/Appium.js'
+import AssertionFailedError from '../../lib/assert/error.js'
+import { fileExists } from '../../lib/utils.js'
+import * as codeceptjs from '../../lib/index.js'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
 
 const expect = chai.expect
 const assert = chai.assert
-const path = require('path')
-
-const Appium = require('../../lib/helper/Appium')
-const AssertionFailedError = require('../../lib/assert/error')
-const fileExists = require('../../lib/utils').fileExists
-global.codeceptjs = require('../../lib')
+global.codeceptjs = codeceptjs.default || codeceptjs
 
 let app
 const apk_path = 'storage:filename=selendroid-test-app-0.17.0.apk'

test/helper/JSONResponse_test.js

@@ -1,10 +1,11 @@
-const chai = require('chai')
+import chai from 'chai'
+import joi from 'joi'
+import { JSONResponse } from '../../lib/helper/JSONResponse.js'
+import Container from '../../lib/container.js'
+import * as codeceptjs from '../../lib/index.js'
 
 const expect = chai.expect
-const joi = require('joi')
-const JSONResponse = require('../../lib/helper/JSONResponse')
-const Container = require('../../lib/container')
-global.codeceptjs = require('../../lib')
+global.codeceptjs = codeceptjs.default || codeceptjs
 
 const data = {
   posts: [

test/rest/ApiDataFactory_test.js

@@ -1,10 +1,11 @@
-const path = require('path')
-const fs = require('fs')
-
-require('../support/setup')
-const TestHelper = require('../support/TestHelper')
-const ApiDataFactory = require('../../lib/helper/ApiDataFactory')
-global.codeceptjs = require('../../lib')
+import path from 'path'
+import fs from 'fs'
+
+import '../support/setup.js'
+import TestHelper from '../support/TestHelper.js'
+import ApiDataFactory from '../../lib/helper/ApiDataFactory.js'
+import * as codeceptjs from '../../lib/index.js'
+global.codeceptjs = codeceptjs.default || codeceptjs
 
 const api_url = TestHelper.jsonServerUrl()
 

test/rest/REST_test.js

@@ -1,14 +1,15 @@
-const path = require('path')
-const { expect } = require('expect')
-const fs = require('fs')
+import path from 'path'
+import { expect } from 'expect'
+import fs from 'fs'
 
-const TestHelper = require('../support/TestHelper')
-const REST = require('../../lib/helper/REST')
-const Container = require('../../lib/container')
-const Secret = require('../../lib/secret')
+import TestHelper from '../support/TestHelper.js'
+import REST from '../../lib/helper/REST.js'
+import Container from '../../lib/container.js'
+import Secret from '../../lib/secret.js'
 
 const api_url = TestHelper.jsonServerUrl()
-global.codeceptjs = require('../../lib')
+import * as codeceptjs from '../../lib/index.js'
+global.codeceptjs = codeceptjs.default || codeceptjs
 
 let I
 const dbFile = path.join(__dirname, '/../data/rest/db.json')
@@ -150,7 +151,7 @@ describe('REST', () => {
     })
 
     it('should be able to parse JSON responses', async () => {
-      await I.sendGetRequest('https://reqres.in/api/comments/1', { 'x-api-key': 'reqres-free-v1'})
+      await I.sendGetRequest('https://reqres.in/api/comments/1', { 'x-api-key': 'reqres-free-v1' })
       await jsonResponse.seeResponseCodeIsSuccessful()
       await jsonResponse.seeResponseContainsKeys(['data', 'support'])
     })