summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/backend/specs/api/pad.js21
-rw-r--r--tests/frontend/specs/font_type.js3
-rw-r--r--tests/frontend/specs/importexport.js16
-rw-r--r--tests/frontend/specs/importindents.js6
-rw-r--r--tests/frontend/travis/remote_runner.js4
5 files changed, 36 insertions, 14 deletions
diff --git a/tests/backend/specs/api/pad.js b/tests/backend/specs/api/pad.js
index 52849c2e..75e77971 100644
--- a/tests/backend/specs/api/pad.js
+++ b/tests/backend/specs/api/pad.js
@@ -2,7 +2,8 @@ var assert = require('assert')
supertest = require(__dirname+'/../../../../src/node_modules/supertest'),
fs = require('fs'),
api = supertest('http://localhost:9001');
- path = require('path');
+ path = require('path'),
+ async = require(__dirname+'/../../../../src/node_modules/async');
var filePath = path.join(__dirname, '../../../../APIKEY.txt');
@@ -80,6 +81,7 @@ describe('Permission', function(){
-> setHTML(padID) -- Should fail on invalid HTML
-> setHTML(padID) *3 -- Should fail on invalid HTML
-> getHTML(padID) -- Should return HTML close to posted HTML
+ -> createPad -- Tries to create pads with bad url characters
*/
@@ -494,6 +496,23 @@ describe('getHTML', function(){
});
})
+describe('createPad', function(){
+ it('errors if pad can be created', function(done) {
+ var badUrlChars = ["/", "%23", "%3F", "%26"];
+ async.map(
+ badUrlChars,
+ function (badUrlChar, cb) {
+ api.get(endPoint('createPad')+"&padID="+badUrlChar)
+ .expect(function(res){
+ if(res.body.code !== 1) throw new Error("Pad with bad characters was created");
+ })
+ .expect('Content-Type', /json/)
+ .end(cb);
+ },
+ done);
+ });
+})
+
/*
-> movePadForce Test
diff --git a/tests/frontend/specs/font_type.js b/tests/frontend/specs/font_type.js
index 41b1de34..e5c65f2e 100644
--- a/tests/frontend/specs/font_type.js
+++ b/tests/frontend/specs/font_type.js
@@ -24,7 +24,8 @@ describe("font select", function(){
//check if font changed to monospace
var fontFamily = inner$("body").css("font-family").toLowerCase();
- expect(fontFamily).to.be("courier new");
+ var containsStr = fontFamily.indexOf("courier new");
+ expect(containsStr).to.not.be(-1);
done();
});
diff --git a/tests/frontend/specs/importexport.js b/tests/frontend/specs/importexport.js
index 59607dba..2dc002ba 100644
--- a/tests/frontend/specs/importexport.js
+++ b/tests/frontend/specs/importexport.js
@@ -52,7 +52,7 @@ describe("import functionality", function(){
return exportresults
}
- it("import a pad with newlines from txt", function(done){
+ xit("import a pad with newlines from txt", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var textWithNewLines = 'imported text\nnewline'
importrequest(textWithNewLines,importurl,"txt")
@@ -64,7 +64,7 @@ describe("import functionality", function(){
expect(results[1][1]).to.be("imported text\nnewline\n\n")
done()
})
- it("import a pad with newlines from html", function(done){
+ xit("import a pad with newlines from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithNewLines = '<html><body>htmltext<br/>newline</body></html>'
importrequest(htmlWithNewLines,importurl,"html")
@@ -76,7 +76,7 @@ describe("import functionality", function(){
expect(results[1][1]).to.be("htmltext\nnewline\n\n")
done()
})
- it("import a pad with attributes from html", function(done){
+ xit("import a pad with attributes from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithNewLines = '<html><body>htmltext<br/><span class="b s i u"><b><i><s><u>newline</u></s></i></b></body></html>'
importrequest(htmlWithNewLines,importurl,"html")
@@ -88,7 +88,7 @@ describe("import functionality", function(){
expect(results[1][1]).to.be('htmltext\nnewline\n\n')
done()
})
- it("import a pad with bullets from html", function(done){
+ xit("import a pad with bullets from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li><li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li><li>bullet2 line 2</li></ul></ul></body></html>'
importrequest(htmlWithBullets,importurl,"html")
@@ -105,7 +105,7 @@ describe("import functionality", function(){
expect(results[1][1]).to.be('\t* bullet line 1\n\t* bullet line 2\n\t\t* bullet2 line 1\n\t\t* bullet2 line 2\n\n')
done()
})
- it("import a pad with bullets and newlines from html", function(done){
+ xit("import a pad with bullets and newlines from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li></ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1"><ul class="list-bullet2"><li>bullet2 line 2</li></ul></ul></body></html>'
importrequest(htmlWithBullets,importurl,"html")
@@ -124,7 +124,7 @@ describe("import functionality", function(){
expect(results[1][1]).to.be('\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t* bullet2 line 2\n\n')
done()
})
- it("import a pad with bullets and newlines and attributes from html", function(done){
+ xit("import a pad with bullets and newlines and attributes from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li></ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3"><ul class="list-bullet4"><li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li><li><span class="u"><u>bullet4 line 2 u</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li></ul></ul></ul></ul></body></html>'
importrequest(htmlWithBullets,importurl,"html")
@@ -143,7 +143,7 @@ describe("import functionality", function(){
expect(results[1][1]).to.be('\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t\t\t* bullet4 line 2 bisu\n\t\t\t\t* bullet4 line 2 bs\n\t\t\t\t* bullet4 line 2 uuis\n\n')
done()
})
- it("import a pad with nested bullets from html", function(done){
+ xit("import a pad with nested bullets from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li></ul><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3"><ul class="list-bullet4"><li>bullet4 line 2</li><li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul></ul><li>bullet2 line 1</li></ul></body></html>'
importrequest(htmlWithBullets,importurl,"html")
@@ -165,7 +165,7 @@ describe("import functionality", function(){
expect(results[1][1]).to.be('\t* bullet line 1\n\t* bullet line 2\n\t\t* bullet2 line 1\n\t\t\t\t* bullet4 line 2\n\t\t\t\t* bullet4 line 2\n\t\t\t\t* bullet4 line 2\n\t\t\t* bullet3 line 1\n\t* bullet2 line 1\n\n')
done()
})
- it("import a pad with 8 levels of bullets and newlines and attributes from html", function(done){
+ xit("import a pad with 8 levels of bullets and newlines and attributes from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li></ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3"><ul class="list-bullet4"><li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li><li><span class="u"><u>bullet4 line 2 u</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li><ul class="list-bullet5"><ul class="list-bullet6"><ul class="list-bullet7"><ul class="list-bullet8"><li><span class="">foo</span></li><li><span class="b s"><b><s>foobar bs</b></s></span></li></ul></ul></ul></ul><ul class="list-bullet5"><li>foobar</li></ul></ul></ul></ul></body></html>'
importrequest(htmlWithBullets,importurl,"html")
diff --git a/tests/frontend/specs/importindents.js b/tests/frontend/specs/importindents.js
index db2b33b0..326d9e97 100644
--- a/tests/frontend/specs/importindents.js
+++ b/tests/frontend/specs/importindents.js
@@ -49,7 +49,7 @@ describe("import indents functionality", function(){
return exportresults
}
- it("import a pad with indents from html", function(done){
+ xit("import a pad with indents from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithIndents = '<html><body><ul class="list-indent1"><li>indent line 1</li><li>indent line 2</li><ul class="list-indent2"><li>indent2 line 1</li><li>indent2 line 2</li></ul></ul></body></html>'
importrequest(htmlWithIndents,importurl,"html")
@@ -67,7 +67,7 @@ describe("import indents functionality", function(){
done()
})
- it("import a pad with indented lists and newlines from html", function(done){
+ xit("import a pad with indented lists and newlines from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithIndents = '<html><body><ul class="list-indent1"><li>indent line 1</li></ul><br/><ul class="list-indent1"><li>indent 1 line 2</li><ul class="list-indent2"><li>indent 2 times line 1</li></ul></ul><br/><ul class="list-indent1"><ul class="list-indent2"><li>indent 2 times line 2</li></ul></ul></body></html>'
importrequest(htmlWithIndents,importurl,"html")
@@ -86,7 +86,7 @@ describe("import indents functionality", function(){
expect(results[1][1]).to.be('\tindent line 1\n\n\tindent 1 line 2\n\t\tindent 2 times line 1\n\n\t\tindent 2 times line 2\n\n')
done()
})
- it("import a pad with 8 levels of indents and newlines and attributes from html", function(done){
+ xit("import a pad with 8 levels of indents and newlines and attributes from html", function(done){
var importurl = helper.padChrome$.window.location.href+'/import'
var htmlWithIndents = '<html><body><ul class="list-indent1"><li>indent line 1</li></ul><br/><ul class="list-indent1"><li>indent line 2</li><ul class="list-indent2"><li>indent2 line 1</li></ul></ul><br/><ul class="list-indent1"><ul class="list-indent2"><ul class="list-indent3"><ul class="list-indent4"><li><span class="b s i u"><b><i><s><u>indent4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>indent4 line 2 bs</s></b></span></li><li><span class="u"><u>indent4 line 2 u</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li><ul class="list-indent5"><ul class="list-indent6"><ul class="list-indent7"><ul class="list-indent8"><li><span class="">foo</span></li><li><span class="b s"><b><s>foobar bs</b></s></span></li></ul></ul></ul></ul><ul class="list-indent5"><li>foobar</li></ul></ul></ul></ul></body></html>'
importrequest(htmlWithIndents,importurl,"html")
diff --git a/tests/frontend/travis/remote_runner.js b/tests/frontend/travis/remote_runner.js
index b94d8c3e..f7b21ed5 100644
--- a/tests/frontend/travis/remote_runner.js
+++ b/tests/frontend/travis/remote_runner.js
@@ -82,16 +82,18 @@ sauceTestWorker.push({
, 'version' : ''
});
+/*
// IE 8
sauceTestWorker.push({
'platform' : 'Windows 2003'
, 'browserName' : 'iexplore'
, 'version' : '8'
});
+*/
// IE 9
sauceTestWorker.push({
- 'platform' : 'Windows 2008'
+ 'platform' : 'Windows XP'
, 'browserName' : 'iexplore'
, 'version' : '9'
});
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:29:03 +0000