Merge branch 'master' into open671

2016-05-09 10:19:24 -07:00
parent 934eb13813 d6aa31e4aa
commit f3b265bdd5
70 changed files with 2241 additions and 1786 deletions
--- a/platform/core/test/actions/ActionCapabilitySpec.js
+++ b/platform/core/test/actions/ActionCapabilitySpec.js
@@ -26,8 +26,8 @@
 define(
    ["../../src/actions/ActionCapability"],
    function (ActionCapability) {
-        //TODO: Disabled for NEM beta
-        xdescribe("The action capability", function () {
+
+        describe("The action capability", function () {
            var mockQ,
                mockAction,
                mockActionService,
@@ -95,4 +95,4 @@ define(

        });
    }
-);
+);