Merge f1c8a14 into f9dbe81

mesosphere · Jul 5, 2017 · 300d264 · 300d264
2 parents f9dbe81 + f1c8a14
commit 300d264
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/src/js/stores/schemes/appScheme.js b/src/js/stores/schemes/appScheme.js
@@ -5,7 +5,7 @@ import AppTypes from "../../constants/AppTypes";
 const appScheme = {
   cmd: null,
   constraints: [],
-  acceptedResourceRoles: [],
+  acceptedResourceRoles: null,
   container: null,
   cpus: null,
   dependencies: [],

diff --git a/src/js/stores/transforms/AppFormModelPostProcess.js b/src/js/stores/transforms/AppFormModelPostProcess.js
@@ -18,15 +18,6 @@ function hasOnlyEmptyValues(obj) {
 }
 
 const AppFormModelPostProcess = {
-  acceptedResourceRoles: (app) => {
-    var acceptedResourceRoles = app.acceptedResourceRoles;
-
-    if (acceptedResourceRoles != null &&
-        Util.isArray(acceptedResourceRoles) &&
-        acceptedResourceRoles.length === 0) {
-      app.acceptedResourceRoles = ["*"];
-    }
-  },
   container: (app) => {
     var container = app.container;
     if (container == null) {

diff --git a/src/test/units/AppFormModelPostProcess.test.js b/src/test/units/AppFormModelPostProcess.test.js
@@ -7,16 +7,6 @@ import ContainerConstants from "../../js/constants/ContainerConstants";
 
 describe("App Form Model Post Process", function () {
 
-  it("empty accepted resource roles defaults to '*'", function () {
-    var app = {
-      acceptedResourceRoles: []
-    };
-
-    AppFormModelPostProcess.acceptedResourceRoles(app);
-
-    expect(app).to.deep.equal({acceptedResourceRoles: ["*"]});
-  });
-
   describe("container", function () {
 
     it("empty container values to null", function () {

diff --git a/src/test/units/AppVersionComponent.test.js b/src/test/units/AppVersionComponent.test.js
@@ -54,7 +54,7 @@ describe("AppVersionComponent", function () {
         "maximumOverCapacity": 1.0
       },
       "labels": {},
-      "acceptedResourceRoles": [],
+      "acceptedResourceRoles": null,
       "version": "2015-06-29T12:57:02.269Z"
     };