From 0ef8f5809024b1ccb7619b1181ed0c5f9752064f Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Thu, 30 Nov 2017 15:39:32 -0500 Subject: [PATCH] Remove Travis references --- .gitignore | 1 + README.md | 6 ++++-- script/cibuild | 13 ------------- spec/api-crash-reporter-spec.js | 11 +++-------- spec/api-protocol-spec.js | 6 ------ spec/chromium-spec.js | 12 ------------ spec/node-spec.js | 6 ------ spec/package-lock.json | 1 - spec/webview-spec.js | 30 ------------------------------ 9 files changed, 8 insertions(+), 78 deletions(-) diff --git a/.gitignore b/.gitignore index eb045368b7a5..44b2f6427a40 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ /vendor/llvm-build/ /vendor/llvm/ /vendor/node/deps/node-inspect/.npmrc +/vendor/node/deps/npm/test/fixtures/config/.npmrc /vendor/npm/ /vendor/python_26/ node_modules/ diff --git a/README.md b/README.md index d9ad098a6aca..22394903b673 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org) -[![Travis Build Status](https://travis-ci.org/electron/electron.svg?branch=master)](https://travis-ci.org/electron/electron) -[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/bc56v83355fi3369/branch/master?svg=true)](https://ci.appveyor.com/project/electron-bot/electron/branch/master) + +[![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/master.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/master) +[![AppVeyor Build Status](https://windows-ci.electronjs.org/api/projects/status/nilyf07hcef14dvj/branch/master?svg=true)](https://windows-ci.electronjs.org/project/AppVeyor/electron/branch/master) +[![Jenkins Build Status](https://mac-ci.electronjs.org/buildStatus/icon?job=Electron%20org/electron/master)](https://mac-ci.electronjs.org/blue/organizations/jenkins/Electron%20org%2Felectron/activity?branch=master) [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev) [![Join the Electron Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com/) diff --git a/script/cibuild b/script/cibuild index 7186a5726d46..4d4f32006573 100755 --- a/script/cibuild +++ b/script/cibuild @@ -57,19 +57,6 @@ def main(): if os.environ.has_key('TARGET_ARCH'): target_arch = os.environ['TARGET_ARCH'] - is_travis = (os.getenv('TRAVIS') == 'true') - if is_travis and PLATFORM == 'linux': - print 'Setup travis CI' - execute(['sudo', 'apt-get', 'update']) - deps = LINUX_DEPS - if target_arch == 'arm': - deps += LINUX_DEPS_ARM - elif target_arch == 'arm64': - deps += LINUX_DEPS_ARM64 - else: - deps += LINUX_DEPS_NO_ARM - execute(['sudo', 'apt-get', 'install'] + deps) - if PLATFORM == 'linux' and target_arch == 'x64': os.environ['DISPLAY'] = ':99.0' execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js index a24373f2338e..b4d55cd70b70 100644 --- a/spec/api-crash-reporter-spec.js +++ b/spec/api-crash-reporter-spec.js @@ -55,7 +55,6 @@ describe('crashReporter module', () => { it('should send minidump when renderer crashes', function (done) { // TODO(alexeykuzmin): Skip the test instead of marking it as passed. if (process.env.APPVEYOR === 'True') return done() - if (process.env.TRAVIS === 'true') return done() this.timeout(180000) @@ -76,7 +75,6 @@ describe('crashReporter module', () => { it('should send minidump when node processes crash', function (done) { // TODO(alexeykuzmin): Skip the test instead of marking it as passed. if (process.env.APPVEYOR === 'True') return done() - if (process.env.TRAVIS === 'true') return done() this.timeout(180000) @@ -172,7 +170,6 @@ describe('crashReporter module', () => { it('should send minidump with updated extra parameters', function (done) { // TODO(alexeykuzmin): Skip the test instead of marking it as passed. if (process.env.APPVEYOR === 'True') return done() - if (process.env.TRAVIS === 'true') return done() this.timeout(180000) @@ -261,11 +258,9 @@ describe('crashReporter module', () => { describe('getLastCrashReport', () => { it('correctly returns the most recent report', () => { - if (process.env.TRAVIS === 'False') { - const reports = crashReporter.getUploadedReports() - const lastReport = reports[0] - assert(lastReport != null) - } + const reports = crashReporter.getUploadedReports() + const lastReport = reports[0] + assert(lastReport != null) }) }) diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js index f214bfc6d27f..cd2e45198983 100644 --- a/spec/api-protocol-spec.js +++ b/spec/api-protocol-spec.js @@ -686,12 +686,6 @@ describe('protocol module', () => { }) it('sends error when callback is called with nothing', function (done) { - if (process.env.TRAVIS === 'true') { - // FIXME(alexeykuzmin): Skip the test. - // this.skip() - return done() - } - protocol.interceptBufferProtocol('http', emptyHandler, (error) => { if (error) return done(error) $.ajax({ diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js index f068ef75f12d..db577ab4578c 100644 --- a/spec/chromium-spec.js +++ b/spec/chromium-spec.js @@ -30,12 +30,6 @@ describe('chromium feature', () => { describe('heap snapshot', () => { it('does not crash', function () { - if (process.env.TRAVIS === 'true') { - // FIXME(alexeykuzmin): Skip the test. - // this.skip() - return - } - process.atomBinding('v8_util').takeHeapSnapshot() }) }) @@ -173,12 +167,6 @@ describe('chromium feature', () => { }) describe('window.open', () => { - before(function () { - if (process.env.TRAVIS === 'true' && process.platform === 'darwin') { - this.skip() - } - }) - it('returns a BrowserWindowProxy object', () => { const b = window.open('about:blank', '', 'show=no') assert.equal(b.closed, false) diff --git a/spec/node-spec.js b/spec/node-spec.js index 48121ee84ceb..edfc51ab1ede 100644 --- a/spec/node-spec.js +++ b/spec/node-spec.js @@ -135,12 +135,6 @@ describe('node feature', () => { describe('contexts', () => { describe('setTimeout in fs callback', () => { - before(function () { - if (process.env.TRAVIS === 'true') { - this.skip() - } - }) - it('does not crash', (done) => { fs.readFile(__filename, () => { setTimeout(done, 0) diff --git a/spec/package-lock.json b/spec/package-lock.json index 4d082f37749c..604787bfaafc 100644 --- a/spec/package-lock.json +++ b/spec/package-lock.json @@ -2,7 +2,6 @@ "name": "electron-test", "version": "0.1.0", "lockfileVersion": 1, - "requires": true, "dependencies": { "ansi-regex": { "version": "2.1.1", diff --git a/spec/webview-spec.js b/spec/webview-spec.js index 0e4d8cf291ee..72e28c7e4adc 100644 --- a/spec/webview-spec.js +++ b/spec/webview-spec.js @@ -416,12 +416,6 @@ describe(' tag', function () { }) describe('allowpopups attribute', () => { - before(function () { - if (process.env.TRAVIS === 'true' && process.platform === 'darwin') { - this.skip() - } - }) - it('can not open new window when not set', (done) => { const listener = (e) => { assert.equal(e.message, 'null') @@ -506,12 +500,6 @@ describe(' tag', function () { }) describe('new-window event', () => { - before(function () { - if (process.env.TRAVIS === 'true' && process.platform === 'darwin') { - this.skip() - } - }) - it('emits when window.open is called', (done) => { webview.addEventListener('new-window', (e) => { assert.equal(e.url, 'http://host/') @@ -840,12 +828,6 @@ describe(' tag', function () { describe('executeJavaScript', () => { it('should support user gesture', function (done) { - if (process.env.TRAVIS !== 'true' || process.platform === 'darwin') { - // FIXME(alexeykuzmin): Skip the test. - // this.skip() - return done() - } - const listener = () => { webview.removeEventListener('enter-html-full-screen', listener) done() @@ -862,12 +844,6 @@ describe(' tag', function () { }) it('can return the result of the executed script', function (done) { - if (process.env.TRAVIS === 'true' && process.platform === 'darwin') { - // FIXME(alexeykuzmin): Skip the test. - // this.skip() - return done() - } - const listener = () => { const jsScript = "'4'+2" webview.executeJavaScript(jsScript, false, (result) => { @@ -1579,12 +1555,6 @@ describe(' tag', function () { }) it('can be manually resized with setSize even when attribute is present', function (done) { - if (process.env.TRAVIS === 'true') { - // FIXME(alexeykuzmin): Skip the test. - // this.skip() - return done() - } - w = new BrowserWindow({show: false, width: 200, height: 200}) w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)