Merge lp:~abreu-alexandre/unity-js-scopes/not-handled-activation-query-default into lp:unity-js-scopes

[Alexandre Abreu]

Return default ActivationQueryBase (not handled) if no callback is found

Return default ActivationQueryBase (not handled) if no callback is found

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/86
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/86/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/85/rebuild

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Looks good

review: Approve

=== modified file 'src/bindings/src/scope-base.cc'
--- src/bindings/src/scope-base.cc	2016-02-13 16:01:06 +0000
+++ src/bindings/src/scope-base.cc	2016-03-03 22:01:45 +0000
@@ -145,7 +145,7 @@
       unity::scopes::Result const &result,
       unity::scopes::ActionMetadata const &metadata) {
   if (activate_callback_.IsEmpty()) {
-    return nullptr;
+    return unity::scopes::ScopeBase::activate(result, metadata);
   }
 
   return EventQueue::instance().run<unity::scopes::ActivationQueryBase::UPtr>(