From f87300d30e8bcbefc5e7b62545fb956598de99e2 Mon Sep 17 00:00:00 2001 From: Paris Date: Thu, 9 Jun 2016 09:49:11 +0300 Subject: [PATCH 1/6] Remove old test-suite completely --- test/bench.js | 49 ------------------------------------------------- test/data.diff | 10 ---------- test/index.html | 49 ------------------------------------------------- test/index.js | 33 --------------------------------- 4 files changed, 141 deletions(-) delete mode 100644 test/bench.js delete mode 100644 test/data.diff delete mode 100644 test/index.html delete mode 100644 test/index.js diff --git a/test/bench.js b/test/bench.js deleted file mode 100644 index 17d54df0..00000000 --- a/test/bench.js +++ /dev/null @@ -1,49 +0,0 @@ -/** - * term.js - * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License) - */ - -var element = { - createElement: function() { return element; }, - appendChild: function() {}, - removeChild: function() {}, - addEventListener: function() {}, - removeEventListener: function() {}, - setAttribute: function() {}, - style: {} -}; - -global.window = global; -window.navigator = { userAgent: '' }; -window.document = element; -window.document.body = element; - -element.ownerDocument = window.document; -window.document.defaultView = window; - -var Terminal = require('../src/term'); -Terminal.cursorBlink = false; - -var data = require('./data').data; - -var term = new Terminal({ - cols: 250, - rows: 100 -}); - -term.open(element); - -var time = new Date; -var t = 10; - -while (t--) { - var l = data.length - , i = 0; - - for (; i < l; i++) { - term.write(data[i]); - } -} - -console.log('Completed: %d.', new Date - time); -console.log('Average (?): 13.5k (for ~2.7k writes).'); diff --git a/test/data.diff b/test/data.diff deleted file mode 100644 index fcd8e61a..00000000 --- a/test/data.diff +++ /dev/null @@ -1,10 +0,0 @@ -167a168,170 -> var stream = fs.createWriteStream(__dirname + '/../test/data.js'); -> stream.write('this.data = [\n'); -> -169a173 -> stream.write(' ' + JSON.stringify(data) + ',\n'); -182a187,189 -> -> stream.write('];\n'); -> stream.end(); diff --git a/test/index.html b/test/index.html deleted file mode 100644 index b3c517fb..00000000 --- a/test/index.html +++ /dev/null @@ -1,49 +0,0 @@ - -term.js test - -

term.js test

- - - diff --git a/test/index.js b/test/index.js deleted file mode 100644 index d798195e..00000000 --- a/test/index.js +++ /dev/null @@ -1,33 +0,0 @@ -/** - * term.js - * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License) - */ - -var http = require('http') - , path = require('path') - , fs = require('fs'); - -var express = require('express') - , term = require('../'); - -var app = express() - , server = http.createServer(app); - -app.use(function(req, res, next) { - var setHeader = res.setHeader; - res.setHeader = function(name) { - switch (name) { - case 'Cache-Control': - case 'Last-Modified': - case 'ETag': - return; - } - return setHeader.apply(res, arguments); - }; - next(); -}); - -app.use(express.static(__dirname)); -app.use(term.middleware()); - -server.listen(8080); From fa093e2bd2b2ab4e4d7c8aa5bc0c7544804136b7 Mon Sep 17 00:00:00 2001 From: Paris Date: Thu, 9 Jun 2016 10:04:53 +0300 Subject: [PATCH 2/6] Set up environment for testing --- bin/test | 5 +++++ package.json | 7 +++++-- test/test.js | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 bin/test create mode 100644 test/test.js diff --git a/bin/test b/bin/test new file mode 100755 index 00000000..d7d2ed24 --- /dev/null +++ b/bin/test @@ -0,0 +1,5 @@ +#! /bin/bash +# +# Testing script for xterm.js + +node_modules/.bin/mocha $@ diff --git a/package.json b/package.json index 59461ed2..73fde3c7 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,12 @@ "devDependencies": { "express": "4.13.4", "express-ws": "2.0.0-rc.1", - "pty.js": "0.3.0" + "pty.js": "0.3.0", + "mocha": "2.5.3", + "chai": "3.5.0" }, "scripts": { - "start": "bash bin/server" + "start": "bash bin/server", + "test": "bash bin/test" } } diff --git a/test/test.js b/test/test.js new file mode 100644 index 00000000..d746eb28 --- /dev/null +++ b/test/test.js @@ -0,0 +1,6 @@ +var assert = require('chai').assert; + + +describe('xterm', function() { + // Just a dummy first test +}); From b91e737017026e1307662113c02b0288e2d0bac6 Mon Sep 17 00:00:00 2001 From: Paris Date: Thu, 9 Jun 2016 10:08:44 +0300 Subject: [PATCH 3/6] Add .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..03a4ff85 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +node_js: + - 4 +notifications: + email: false From ab1526b0850e4d5979eac9168791c15b6b914ba4 Mon Sep 17 00:00:00 2001 From: Paris Date: Thu, 9 Jun 2016 10:10:36 +0300 Subject: [PATCH 4/6] Add travis ci build status in xterm.js --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5e2b00e1..d6b40e3d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # xterm.js +![xterm.js build status](https://api.travis-ci.org/sourcelair/xterm.js.svg) + Xterm.js is a full xterm clone, written in JavaScript. It is used at [SourceLair](https://www.sourcelair.com/home) to help people develop their applications in their browsers. From beff0db3017c13289a3743d2ddd613a0da2c5fda Mon Sep 17 00:00:00 2001 From: Paris Date: Thu, 9 Jun 2016 10:18:39 +0300 Subject: [PATCH 5/6] Add apt addon in travis for node-gyp dependency of pty.js --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 03a4ff85..3849b59e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ language: node_js node_js: - 4 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 notifications: email: false From abb7a495846ff8c70a2f6c573648b06a75624e6d Mon Sep 17 00:00:00 2001 From: Paris Date: Thu, 9 Jun 2016 10:22:49 +0300 Subject: [PATCH 6/6] Add CXX environment --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3849b59e..b085a7bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: node_js node_js: - - 4 + - 4 +env: + - CXX=g++-4.8 addons: apt: sources: @@ -8,4 +10,4 @@ addons: packages: - g++-4.8 notifications: - email: false + email: false