Skip to content

Commit 4a013b5

Browse files
committed
Fix for Jenkins failures
1 parent 81cde06 commit 4a013b5

File tree

3 files changed

+20
-71
lines changed

3 files changed

+20
-71
lines changed

gulpfile.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function loadProxyTestData(callback) {
105105
});
106106
}
107107

108-
function loadProxyTestCases(callback) {
108+
function loadProxyTestCases() {
109109
const databaseClient = getTestModulesClient();
110110
const documentMetadata = {
111111
collections: ['/dbf/test/cases'],
@@ -151,25 +151,18 @@ function runProxyTests() {
151151
}
152152
}));
153153
}
154-
function proxyDocTests() {
155-
return gulp.src(['test-basic-proxy/lib/positive/DescribedBundle.js'])
156-
.pipe(jsdoc({opts:{destination:'test-basic-proxy/doc'}}));
157-
}
158154

159155
exports.doc = doc;
160156
exports.lint = lint;
161157
exports.loadProxyTests = parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases);
162158
exports.generateProxyTests = parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests);
163-
exports.generateProxyDocTests = proxyDocTests;
164159
exports.runProxyTests = runProxyTests;
165160
exports.setupProxyTests = series(
166161
parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases),
167-
parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests),
168-
proxyDocTests);
162+
parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests));
169163
exports.proxyTests = series(
170164
parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases),
171165
parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests),
172-
proxyDocTests,
173166
runProxyTests);
174167
exports.test = test;
175168
exports.default = lint;

test-basic-proxy/lib/positive/describedTest.js

Lines changed: 0 additions & 43 deletions
This file was deleted.

test-basic/unnestTest.js

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,27 @@ describe('test unnest function', function () {
2727
beforeEach(function (done) {
2828

2929
db.documents.remove(['/optic/test/office1.json'])
30-
.result(function(_response){
31-
30+
.result(function(response){
31+
const doc = {
32+
office: [
33+
{ department: "Engineering", teamMembers: "Cindy,Alice,Dan" },
34+
{ department: "Sales", teamMembers: "Bob" },
35+
{ department: "Marketing", teamMembers: null }
36+
]
37+
};
38+
db.documents.write({
39+
uri: '/optic/test/office1.json',
40+
contentType: 'application/json',
41+
content: doc
42+
}).result(function() {
43+
done();
44+
}, function(error) {
45+
done(error);
46+
});
3247
})
33-
.catch(err=> {});
48+
.catch(err=> done(err));
3449

35-
const doc = {
36-
office: [
37-
{ department: "Engineering", teamMembers: "Cindy,Alice,Dan" },
38-
{ department: "Sales", teamMembers: "Bob" },
39-
{ department: "Marketing", teamMembers: null }
40-
]
41-
};
4250

43-
db.documents.write({
44-
uri: '/optic/test/office1.json',
45-
contentType: 'application/json',
46-
content: doc
47-
}).result(function() {
48-
done();
49-
}, function(error) {
50-
done(error);
51-
});
5251
});
5352

5453
it('unnestInner', function (done) {

0 commit comments

Comments
 (0)