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

Fix backend tests with new setText() implementation; tests depended 

on the old setText() behavior leaving the last character.
This commit is contained in:
Xavid 2015-05-06 08:45:22 -04:00
parent 5e64c292a4
commit 9e86fb279b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node/utils/ImportHtml.js
View File

@ -89,7 +89,7 @@ function setPadHTML(pad, html, callback)
// the changeset is ready! // the changeset is ready!
var theChangeset = builder.toString(); var theChangeset = builder.toString();
apiLogger.debug('The changeset: ' + theChangeset); apiLogger.debug('The changeset: ' + theChangeset);
pad.setText(""); pad.setText("\n");
pad.appendRevision(theChangeset); pad.appendRevision(theChangeset);
callback(null); callback(null);
} }

8
tests/backend/specs/api/pad.js
View File

@ -210,7 +210,7 @@ describe('getText', function(){
it('gets the Pad text', function(done) { it('gets the Pad text', function(done) {
api.get(endPoint('getText')+"&padID="+testPadId) api.get(endPoint('getText')+"&padID="+testPadId)
.expect(function(res){ .expect(function(res){
if(res.body.data.text !== "testTextTwo\n") throw new Error("Setting Text") if(res.body.data.text !== "testTextTwo") throw new Error("Setting Text")
}) })
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200, done) .expect(200, done)
@ -386,7 +386,7 @@ describe('getText', function(){
api.get(endPoint('getText')+"&padID="+testPadId) api.get(endPoint('getText')+"&padID="+testPadId)
.expect(function(res){ .expect(function(res){
if(res.body.code !== 0) throw new Error("Pad Get Text failed") if(res.body.code !== 0) throw new Error("Pad Get Text failed")
if(res.body.data.text !== text+"\n") throw new Error("Pad Text not set properly"); if(res.body.data.text !== text) throw new Error("Pad Text not set properly");
}) })
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200, done) .expect(200, done)
@ -419,7 +419,7 @@ describe('getText', function(){
it('Gets text on a pad Id', function(done) { it('Gets text on a pad Id', function(done) {
api.get(endPoint('getText')+"&padID="+newPadId) api.get(endPoint('getText')+"&padID="+newPadId)
.expect(function(res){ .expect(function(res){
if(res.body.data.text !== text+"\n") throw new Error("Pad Get Text failed") if(res.body.data.text !== text) throw new Error("Pad Get Text failed")
}) })
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200, done) .expect(200, done)
@ -441,7 +441,7 @@ describe('getText', function(){
it('Gets text on a pad Id', function(done) { it('Gets text on a pad Id', function(done) {
api.get(endPoint('getText')+"&padID="+testPadId) api.get(endPoint('getText')+"&padID="+testPadId)
.expect(function(res){ .expect(function(res){
if(res.body.data.text !== text+"\n") throw new Error("Pad Get Text failed") if(res.body.data.text !== text) throw new Error("Pad Get Text failed")
}) })
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200, done) .expect(200, done)