fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1178 from marcelklehr/fix/tests 

Fix/tests
This commit is contained in:
John McLear 2012-11-17 07:31:03 -08:00
parent 5009ab1174 ff0c9bb4a0
commit 73eafb92c2
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/hooks/express/tests.js
View File

@ -1,5 +1,6 @@
var path = require("path");
var fs = require("fs");
var path = require("path")
, npm = require("npm")
, fs = require("fs");
exports.expressCreateServer = function (hook_name, args, cb) {
args.app.get('/tests/frontend/specs_list.js', function(req, res){
@ -17,7 +18,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
}
subPath = subPath.split("?")[0];
var filePath = path.normalize(__dirname + "/../../../../tests/frontend/")
var filePath = path.normalize(npm.root + "/../tests/frontend/")
filePath += subPath.replace("..", "");
return filePath;
}

20
tests/frontend/specs/language.js
View File

@ -21,13 +21,7 @@ describe("Language select and change", function(){
$languageoption.attr('selected','selected');
$language.change();
helper.waitFor(function(){
var $boldButton = chrome$(".buttonicon-bold").parent();
//get the title of the bold button
var boldButtonTitle = $boldButton[0]["title"];
return boldButtonTitle !== undefined;
}).done(function(){
setTimeout(function(){
//get the value of the bold button
var $boldButton = chrome$(".buttonicon-bold").parent();
@ -39,7 +33,7 @@ describe("Language select and change", function(){
expect(boldButtonTitle).to.be("Fett (Strg-B)");
done();
});
}, 1000);
});
it("makes text English", function(done) {
@ -58,13 +52,7 @@ describe("Language select and change", function(){
$languageoption.attr('selected','selected');
$language.change();
helper.waitFor(function(){
var $boldButton = chrome$(".buttonicon-bold").parent();
//get the title of the bold button
var boldButtonTitle = $boldButton[0]["title"];
return boldButtonTitle !== undefined;
}).done(function(){
setTimeout(function(){
//get the value of the bold button
var $boldButton = chrome$(".buttonicon-bold").parent();
@ -76,7 +64,7 @@ describe("Language select and change", function(){
expect(boldButtonTitle).to.be("Bold (Ctrl-B)");
done();
});
}, 1000);
});
});