Skip to content

Bug fix - stop promisifying Job#promise and Operation#promise #1732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenplusplus merged 3 commits into from
Oct 21, 2016
Merged

Bug fix - stop promisifying Job#promise and Operation#promise #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f740d6e
Stop promisifying promise methods.
jmdobry Oct 20, 2016
ced8ebe
tests/linting
callmehiphop Oct 21, 2016
abd8718
test tweaks
callmehiphop Oct 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/bigquery/system-test/bigquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,17 @@ describe('BigQuery', function() {
});
});

it('should import data from a file via promises', function() {
return table.import(file)
.then(function(results) {
return results[0].promise();
})

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

.then(function(results) {
var metadata = results[0];
assert.strictEqual(metadata.status.state, 'DONE');
});
});

it('should convert values to their schema types', function(done) {
var data = {
name: 'dave',
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ function promisifyAll(Class, options) {
.keys(Class.prototype)
.filter(function(methodName) {
return is.fn(Class.prototype[methodName]) && // is it a function?
!/(^\_|(Stream|\_)$)/.test(methodName) && // is it public/non-stream?
!/(^\_|(Stream|\_)|promise$)/.test(methodName) && // is it promisable?
exclude.indexOf(methodName) === -1; // is it blacklisted?
});

Expand Down
2 changes: 2 additions & 0 deletions packages/common/test/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,6 +1407,7 @@ describe('common/util', function() {
FakeClass.prototype.method_ = util.noop;
FakeClass.prototype._method = util.noop;
FakeClass.prototype.methodStream = util.noop;
FakeClass.prototype.promise = util.noop;

util.promisifyAll(FakeClass);
instance = new FakeClass();
Expand All @@ -1420,6 +1421,7 @@ describe('common/util', function() {
assert.strictEqual(FakeClass.prototype.method_, util.noop);
assert.strictEqual(FakeClass.prototype._method, util.noop);
assert.strictEqual(FakeClass.prototype.methodStream, util.noop);
assert.strictEqual(FakeClass.prototype.promise, util.noop);
});

it('should optionally except an exclude list', function() {
Expand Down