Skip to content
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.

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

Underscore 1.7.0 upgrade #1019

Merged
merged 5 commits into from
Aug 27, 2014
Merged

Conversation

simong
Copy link
Contributor

@simong simong commented Aug 27, 2014

This is due to an underscore 1.7.0 breaking change.
See: jashkenas/underscore#1736

@simong simong assigned simong and nicolaasmatthijs and unassigned simong Aug 27, 2014
@simong
Copy link
Contributor Author

simong commented Aug 27, 2014

Assigning @nicolaasmatthijs for review

@nicolaasmatthijs
Copy link
Contributor

I'm consistently seeing the same build errors as the ones shown by Travis, so there's probably a bit more going on here.

1) File previews verify previews are downloadable from another tenant:
     Uncaught AssertionError: "undefined" == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-content/tests/test-previews.js:537:52
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/lib/test/util.js:81:28
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
  2) File previews verify restoring a revision results in an updated thumbnail url for the search document:
     Uncaught AssertionError: "undefined" == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-content/tests/test-previews.js:619:32
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/lib/test/util.js:96:36
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
  3) General Search Search Scopes verify the "network" search scope searches resources from inside the current tenant network only:
     Uncaught AssertionError: false == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/tests/test-general-search.js:97:24
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
      at process._tickDomainCallback (node.js:463:13)
  4) General Search Search Scopes verify the "interact" search scope searches only resources with which the user can interact:
     Uncaught AssertionError: false == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/tests/test-general-search.js:97:24
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
      at process._tickDomainCallback (node.js:463:13)
  5) General Search Search Scopes verify the "tenant" search scope searches resources from inside the current tenant as well as resources the user has access to:
     Uncaught AssertionError: null == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/tests/test-general-search.js:95:24
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
      at process._tickDomainCallback (node.js:463:13)
  6) General Search Group Search Visibility verify public group is searchable by everyone:
     Uncaught AssertionError: null == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/tests/test-general-search.js:1879:52
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
      at process._tickDomainCallback (node.js:463:13)
  7) General Search Group Search Visibility verify loggedin group search visibility:
     Uncaught AssertionError: null == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/tests/test-general-search.js:2024:80
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
      at process._tickDomainCallback (node.js:463:13)
  8) General Search Group Search Visibility verify private group search visibility:
     Uncaught AssertionError: null == true
      at /home/travis/build/oaeproject/Hilary/node_modules/oae-search/tests/test-general-search.js:2201:80
      at Request._callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/lib/util.js:9:8823)
      at Request.self.callback (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:121:22)
      at Request.emit (events.js:98:17)
      at Request.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:978:14)
      at Request.emit (events.js:117:20)
      at IncomingMessage.<anonymous> (/home/travis/build/oaeproject/Hilary/node_modules/oae-rest/node_modules/request/request.js:929:12)
      at IncomingMessage.emit (events.js:117:20)
      at _stream_readable.js:938:16
      at process._tickDomainCallback (node.js:463:13)

@nicolaasmatthijs
Copy link
Contributor

Back to @simong for investigation of test failures.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 0e1e89d on simong:underscore-1.7.0 into * on oaeproject:master*.

@simong simong changed the title Using _.template(tpl)(data) rather than _.template(tpl, data) Underscore 1.7.0 upgrade Aug 27, 2014
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 0f006da on simong:underscore-1.7.0 into * on oaeproject:master*.

@simong
Copy link
Contributor Author

simong commented Aug 27, 2014

Got a properly functioning build at https://travis-ci.org/oaeproject/Hilary/builds/33709119 that downgraded elasticsearch to 1.1.1 and included the underscore fixes.

I've rebased my branch and letting it run for another build

@@ -72,8 +72,12 @@ var getMultipleContentItems = module.exports.getMultipleContentItems = function(

// If `fields` was specified, we select only the fields specified. Otherwise we select all (i.e., *)
if (fields) {
if (!_.isArray(fields)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to use OaeUtil.toArray here?

@nicolaasmatthijs
Copy link
Contributor

Finished review. Back to @simong for follow-up

@simong
Copy link
Contributor Author

simong commented Aug 27, 2014

The build succeeded, back to @nicolaasmatthijs for review

@simong simong assigned nicolaasmatthijs and unassigned simong Aug 27, 2014
@nicolaasmatthijs
Copy link
Contributor

Looks good. Merged.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling e750d5b on simong:underscore-1.7.0 into * on oaeproject:master*.

@nicolaasmatthijs nicolaasmatthijs merged commit e750d5b into oaeproject:master Aug 27, 2014
@jdalton
Copy link

jdalton commented Aug 28, 2014

Related to jashkenas/underscore#1805.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants