Skip to content

Commit 08eb790

Browse files
authored
Merge branch 'master' into fix-flaky-test
2 parents e9ff681 + 6ba106b commit 08eb790

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
language: node_js
22
node_js:
33
- "10"
4-
- "9"
54
- "8"
65
- "6"
7-
- "4"
86
script: "ln -s .. node_modules/sharedb; npm run jshint && npm run test-cover"
97
# Send coverage data to Coveralls
108
after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"

lib/db/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ function DB(options) {
77
}
88
module.exports = DB;
99

10+
// When false, Backend will handle projections instead of DB
1011
DB.prototype.projectsSnapshots = false;
1112
DB.prototype.disableSubscribe = false;
1213

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"expect.js": "^0.3.1",
1717
"istanbul": "^0.4.2",
1818
"jshint": "^2.9.2",
19-
"mocha": "^3.2.0",
19+
"mocha": "^5.2.0",
2020
"sharedb-mingo-memory": "^1.0.0-beta"
2121
},
2222
"scripts": {

test/client/submit.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,11 +627,16 @@ describe('client submit', function() {
627627
doc2.del(function(err) {
628628
if (err) return done(err);
629629
doc.pause();
630+
var calledBack = false;
631+
doc.on('error', function() {
632+
expect(calledBack).equal(true);
633+
done();
634+
});
630635
doc.submitOp({p: ['age'], na: 1}, function(err) {
631636
expect(err).ok();
632637
expect(doc.version).equal(2);
633638
expect(doc.data).eql(undefined);
634-
done();
639+
calledBack = true;
635640
});
636641
doc.fetch();
637642
});
@@ -651,11 +656,16 @@ describe('client submit', function() {
651656
doc2.create({age: 5}, function(err) {
652657
if (err) return done(err);
653658
doc.pause();
659+
var calledBack = false;
660+
doc.on('error', function() {
661+
expect(calledBack).equal(true);
662+
done();
663+
});
654664
doc.create({age: 9}, function(err) {
655665
expect(err).ok();
656666
expect(doc.version).equal(3);
657667
expect(doc.data).eql({age: 5});
658-
done();
668+
calledBack = true;
659669
});
660670
doc.fetch();
661671
});

0 commit comments

Comments
 (0)