fix and unblacklist several tests

pull/327/head
nightwing 2016-06-28 23:03:09 +04:00
rodzic 30129604cc
commit 893698d314
4 zmienionych plików z 17 dodań i 22 usunięć

Wyświetl plik

@ -58,7 +58,7 @@
"c9" "c9"
], ],
"c9plugins": { "c9plugins": {
"c9.ide.language": "#0e86345d39", "c9.ide.language": "#0426ee345b",
"c9.ide.language.core": "#bfb5dd2acc", "c9.ide.language.core": "#bfb5dd2acc",
"c9.ide.language.css": "#46ad561506", "c9.ide.language.css": "#46ad561506",
"c9.ide.language.generic": "#b47cbe58f9", "c9.ide.language.generic": "#b47cbe58f9",
@ -73,9 +73,9 @@
"c9.ide.language.codeintel": "#4e0a272229", "c9.ide.language.codeintel": "#4e0a272229",
"c9.ide.collab": "#e015881720", "c9.ide.collab": "#e015881720",
"c9.ide.local": "#9169fec157", "c9.ide.local": "#9169fec157",
"c9.ide.find": "#a2dfc3e306", "c9.ide.find": "#e632ecf4be",
"c9.ide.find.infiles": "#488db22ee1", "c9.ide.find.infiles": "#4484d6162d",
"c9.ide.find.replace": "#47a84af707", "c9.ide.find.replace": "#8468067976",
"c9.ide.run.debug": "#651451a7c2", "c9.ide.run.debug": "#651451a7c2",
"c9.automate": "#47e2c429c9", "c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.emmet": "#6dc4585e02",
@ -109,7 +109,7 @@
"c9.ide.recentfiles": "#7c099abf40", "c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#301d2ab519", "c9.ide.remote": "#301d2ab519",
"c9.ide.processlist": "#2b12cd1bdd", "c9.ide.processlist": "#2b12cd1bdd",
"c9.ide.run": "#20a43e01e4", "c9.ide.run": "#bf68394c6f",
"c9.ide.run.build": "#0598fff697", "c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#054367574c", "c9.ide.run.debug.xdebug": "#054367574c",
"c9.ide.save": "#25a63f31e2", "c9.ide.save": "#25a63f31e2",

Wyświetl plik

@ -40,14 +40,6 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "/vfs-home"],
}, },
"plugins/c9.cli.bridge/bridge-client", "plugins/c9.cli.bridge/bridge-client",
// Mock plugins
{
consumes: [],
provides: [
"preferences", "ui"
],
setup: expect.html.mocked
},
{ {
consumes: ["bridge", "bridge.client"], consumes: ["bridge", "bridge.client"],
provides: [], provides: [],

Wyświetl plik

@ -2,7 +2,7 @@
"use client"; "use client";
require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) { require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], function (architect, chai, vfsRoot) {
var expect = chai.expect; var expect = chai.expect;
expect.setupArchitectTest([ expect.setupArchitectTest([
@ -11,7 +11,8 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
startdate: new Date(), startdate: new Date(),
debug: true, debug: true,
hosted: true, hosted: true,
local: false local: false,
platform: vfsRoot.indexOf(":") == -1 ? "linux" : "win32"
}, },
"plugins/c9.core/http-xhr", "plugins/c9.core/http-xhr",
"plugins/c9.core/ext", "plugins/c9.core/ext",
@ -19,14 +20,8 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
"plugins/c9.vfs.client/vfs_client", "plugins/c9.vfs.client/vfs_client",
"plugins/c9.vfs.client/endpoint", "plugins/c9.vfs.client/endpoint",
"plugins/c9.ide.auth/auth", "plugins/c9.ide.auth/auth",
// Mock plugins
{ {
consumes: [], consumes: ["proc", "c9"],
provides: ["auth.bootstrap", "info", "dialog.error"],
setup: expect.html.mocked
},
{
consumes: ["proc"],
provides: [], provides: [],
setup: main setup: main
} }
@ -34,6 +29,7 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
function main(options, imports, register) { function main(options, imports, register) {
var proc = imports.proc; var proc = imports.proc;
var c9 = imports.c9;
describe('proc', function() { describe('proc', function() {
describe('spawn()', function() { describe('spawn()', function() {
@ -117,10 +113,15 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
}); });
describe('pty()', function() { describe('pty()', function() {
this.timeout(30000); this.timeout(30000);
if (c9.platform == "win32")
return it.skip("Terminal Test", function(done) { done(); });
it("Terminal Test", function(done) { it("Terminal Test", function(done) {
var look = "--color=auto"; var look = "--color=auto";
if (c9.platform == "win32")
return done;
var args = ["-is"]; var args = ["-is"];
proc.pty("bash", { proc.pty("bash", {
args: args, args: args,

Wyświetl plik

@ -614,6 +614,8 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"],
}); });
}); });
it('should copy a node', function(done) { it('should copy a node', function(done) {
expect(fsCache.findNode("/dir/test.html")).to.ok;
expect(fsCache.findNode("/test.html")).to.not.ok;
tree.copy( tree.copy(
[fsCache.findNode("/dir/test.html")], [fsCache.findNode("/dir/test.html")],
fsCache.findNode("/"), fsCache.findNode("/"),