Commit 531305cf authored by Simon Pastor's avatar Simon Pastor
Browse files

pr fix

parent 9f6b9346

js-apps/meep-frontend/src/js/containers/cfg/cfg-page-container.js

+0 −1
Original line number Diff line number Diff line
@@ -596,7 +596,6 @@ class CfgPageContainer extends Component { 
          title="Open Scenario"

          open={this.props.currentDialog === IDC_DIALOG_OPEN_SCENARIO}

          options={this.props.scenarios}

          onDismiss={() => { this.closeDialog();}}

          onClose={() => {

            this.closeDialog();

          }}

js-apps/meep-frontend/src/js/containers/exec/event-container.js

+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ import { 
  EXEC_BTN_EVENT_BTN_AUTOMATION,

  EXEC_BTN_EVENT_BTN_AUTO_REPLAY,

  EXEC_BTN_EVENT_BTN_SAVE_REPLAY,

  EXEC_BTN_EVENT_BTN_CLOSE

  EXEC_BTN_EVENT_BTN_CLOSE,

  MEEP_EVENT_COUNT

} from '../../meep-constants';



const styles = {
@@ -56,7 +57,7 @@ const StatusTable = props => { 
      </GridCell>

      <GridCell align={'middle'} span={3}>

        <Typography use="subtitle2" style={{ marginRight: 10 }}>EVENT COUNT:</Typography>

        <Typography use="body2">{props.index} / {props.maxIndex}</Typography>

        <Typography use="body2" data-cy={MEEP_EVENT_COUNT}>{props.index} / {props.maxIndex}</Typography>

      </GridCell>

      <GridCell align={'middle'} span={4}>

        <Typography use="subtitle2" style={{ marginRight: 10 }}>NEXT/LAST EVENT (S):</Typography>

js-apps/meep-frontend/src/js/meep-constants.js

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ export const EXEC_EVT_MOB_DEST = 'exec-evt-mob-dest'; 
export const EXEC_EVT_NC_TYPE = 'exec-evt-nc-type';

export const EXEC_EVT_NC_NAME = 'exec-evt-nc-name';



export const MEEP_EVENT_COUNT = 'meep-event-count';



// Trivia

export const NO_SCENARIO_NAME = 'NO_SCENARIO_NAME_12Q(*&HGHG___--9098';

test/cypress/integration/tests/scenario-exec-spec-mob-event-demo-app.js

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ describe('Scenario Execution', function () { 


  // Test Variables

  let defaultScenario = 'None';

  let sandbox = 'sbox-test';

  let sandbox = 'sbox-test3';

  let scenario = 'demo1'



  // ------------------------------

test/cypress/integration/tests/scenario-exec-spec.js

+12 −14
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ describe('Scenario Execution', function () { 


  // Test Variables

  let defaultScenario = 'None';

  let sandbox = 'sbox-test';

  let sandbox = 'sbox-test3';

  let scenario = 'demo1';

  let scenario2 = 'demo2';

  let replayEventsName = 'replaydemo1'
@@ -108,6 +108,7 @@ describe('Scenario Execution', function () { 
  });



  // Test Save events

  // previous manual execution created 13 eventsn

  it('Test Event - Save button', function () {

    openDefaultMeepUrl();

    click(meep.MEEP_TAB_EXEC);
@@ -119,6 +120,7 @@ describe('Scenario Execution', function () { 
  });



  // Test Auto-Replay

  //replay event as 13 events in it based on the file that was stored

  it('Test Event - Auto-Replay button', function () {

    openDefaultMeepUrl();

    click(meep.MEEP_TAB_EXEC);
@@ -126,7 +128,7 @@ describe('Scenario Execution', function () { 
    select(meep.EXEC_SELECT_SANDBOX, sandbox);

    cy.wait(3000);



    testAutoReplay(replayEventsName);

    testAutoReplay(replayEventsName, 13);

  });



  // Test Automation
@@ -389,21 +391,18 @@ describe('Scenario Execution', function () { 
  }



  // Auto Replay

  function testAutoReplay(name) {

  function testAutoReplay(name, nbEvents) {

    cy.log('Auto Replay');



    testAutoReplayExecution(name, false)

    cy.wait(1000);

    testAutoReplayExecution(name, false, nbEvents)

    //confirm execution started

    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, false);

    cy.wait(75000);

    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, false, 1000);

    //confirm it executed completely

    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, true);

    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, true, 75000);



    testAutoReplayExecution(name, true)

    cy.wait(1000);

    testAutoReplayExecution(name, true, nbEvents)

    //confirm execution started

    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, false);

    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, false, 1000);

    cy.wait(75000);

    //confirm it executed completely but restarted

    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, false);
@@ -413,7 +412,7 @@ describe('Scenario Execution', function () { 
    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, true);

  }



  function testAutoReplayExecution(name, loop) {

  function testAutoReplayExecution(name, loop, nbEvents) {

    click(meep.EXEC_BTN_EVENT);

    click(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY);

    if (loop) {
@@ -426,8 +425,7 @@ describe('Scenario Execution', function () { 
    verifyEnabled(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START, true);

    click(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_BTN_REPLAY_START)

    //check right number of events will be executed

    cy.contains("EVENT COUNT");

    cy.contains("/ 13");

    verify(meep.MEEP_EVENT_COUNT, 'contain', " / " + nbEvents);

  }



  // Event pane display