Merge branch 'from-installable-to-not-installable' into 'master'

Handle dependencies between cluster managed apps installation status

See merge request gitlab-org/gitlab-ce!29999

app/assets/javascripts/clusters/services/application_state_machine.js

@@ -80,6 +80,9 @@ const applicationStateMachine = {
           installFailed: false,
         },
       },
+      [NOT_INSTALLABLE]: {
+        target: NOT_INSTALLABLE,
+      },
       // This is possible in artificial environments for E2E testing
       [INSTALLED]: {
         target: INSTALLED,
@@ -108,6 +111,9 @@ const applicationStateMachine = {
           updateSuccessful: false,
         },
       },
+      [NOT_INSTALLABLE]: {
+        target: NOT_INSTALLABLE,
+      },
       [UNINSTALL_EVENT]: {
         target: UNINSTALLING,
         effects: {

spec/frontend/clusters/services/application_state_machine_spec.js

@@ -72,9 +72,10 @@ describe('applicationStateMachine', () => {
 
   describe(`current state is ${INSTALLABLE}`, () => {
     it.each`
-      expectedState | event            | effects
-      ${INSTALLING} | ${INSTALL_EVENT} | ${{ installFailed: false }}
-      ${INSTALLED}  | ${INSTALLED}     | ${NO_EFFECTS}
+      expectedState      | event              | effects
+      ${INSTALLING}      | ${INSTALL_EVENT}   | ${{ installFailed: false }}
+      ${INSTALLED}       | ${INSTALLED}       | ${NO_EFFECTS}
+      ${NOT_INSTALLABLE} | ${NOT_INSTALLABLE} | ${NO_EFFECTS}
     `(`transitions to $expectedState on $event event and applies $effects`, data => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
@@ -108,9 +109,10 @@ describe('applicationStateMachine', () => {
 
   describe(`current state is ${INSTALLED}`, () => {
     it.each`
-      expectedState   | event              | effects
-      ${UPDATING}     | ${UPDATE_EVENT}    | ${{ updateFailed: false, updateSuccessful: false }}
-      ${UNINSTALLING} | ${UNINSTALL_EVENT} | ${{ uninstallFailed: false, uninstallSuccessful: false }}
+      expectedState      | event              | effects
+      ${UPDATING}        | ${UPDATE_EVENT}    | ${{ updateFailed: false, updateSuccessful: false }}
+      ${UNINSTALLING}    | ${UNINSTALL_EVENT} | ${{ uninstallFailed: false, uninstallSuccessful: false }}
+      ${NOT_INSTALLABLE} | ${NOT_INSTALLABLE} | ${NO_EFFECTS}
     `(`transitions to $expectedState on $event event and applies $effects`, data => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
@@ -119,7 +121,7 @@ describe('applicationStateMachine', () => {
 
       expect(transitionApplicationState(currentAppState, event)).toEqual({
         status: expectedState,
-        ...effects,
+        ...noEffectsToEmptyObject(effects),
       });
     });
   });