Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codemirror: Replaced PhantomJS Dependency with Puppeteer #6051

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"devDependencies": {
"blint": "^1",
"node-static": "0.7.11",
"phantomjs-prebuilt": "^2.1.12",
"puppeteer": "^1.20.0",
"rollup": "^0.66.2",
"rollup-plugin-buble": "^0.19.2",
"rollup-watch": "^4.3.1"
Expand Down
31 changes: 0 additions & 31 deletions test/phantom_driver.js

This file was deleted.

41 changes: 28 additions & 13 deletions test/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,32 @@ var server = require('http').createServer(function (req, res) {
}).resume();
}).addListener('error', function (err) {
throw err;
}).listen(3000, function () {
var childProcess = require('child_process');
var phantomjs = require("phantomjs-prebuilt");
var childArgs = [
require("path").join(__dirname, 'phantom_driver.js')
];
childProcess.execFile(phantomjs.path, childArgs, function (err, stdout, stderr) {
server.close();
console.log(stdout);
if (err) console.error(err);
if (stderr) console.error(stderr);
process.exit(err || stderr || !ok ? 1 : 0);
}).listen(3000,(async () => {
const puppeteer = require('puppeteer');
const browser = await puppeteer.launch()
const page = await browser.newPage()
await page.goto('http://localhost:3000/test/index.html')
page.on('dialog', async dialog => {
console.log(dialog.message())
await dialog.dismiss()
})
var ret1 = false;
while(1){
ret1 = await page.evaluate(() => {
var output = document.getElementById('status');
if (!output) {
return false;
}
return (/^(\d+ failures?|all passed)/i).test(output.innerText);
})
if(ret1 === true) { break}
}
var failed = await page.evaluate(function () { return window.failed; });
var output = await page.evaluate(function () {
return document.getElementById('output').innerText + "\n" +
document.getElementById('status').innerText;
});
});
console.log(output);
process.exit(failed > 0 ? 1 : 0);
await browser.close()
})());
1 change: 1 addition & 0 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
var mac = /Mac/.test(navigator.platform);
var phantom = /PhantomJS/.test(navigator.userAgent);
var chrome = !edge && /Chrome\//.test(navigator.userAgent);
var opera = /Opera\/\./.test(navigator.userAgent);
var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
if (opera_version) opera_version = Number(opera_version);
Expand Down