Commit 6c3352ac authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

use application group name if present + minor cypress test fix

parent a9965b92

go-apps/meep-sandbox-ctrl/server/app-ctrl.go

+8 −1
Original line number Diff line number Diff line
@@ -132,10 +132,17 @@ func createAppInstance(proc *dataModel.Process, ctx *mod.NodeContext) (*apps.App 
		appType = apps.TypeSystem

	}



	// If group name is present, use it as application name

	// Otherwise, use process name

	appName := proc.Name

	if proc.ServiceConfig != nil && proc.ServiceConfig.MeSvcName != "" {

		appName = proc.ServiceConfig.MeSvcName

	}



	// Create & app instance

	app := &apps.Application{

		Id:      proc.Id,

		Name:    proc.Name,

		Name:    appName,

		Node:    ctx.Parents[mod.PhyLoc],

		Type:    appType,

		Persist: false,

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

+3 −1
Original line number Diff line number Diff line
@@ -379,8 +379,10 @@ describe('Scenario Execution', function () { 
    type(meep.MEEP_DLG_SAVE_REPLAY_NAME, name);

    type(meep.MEEP_DLG_SAVE_REPLAY_DESCRIPTION, desc);

    click(meep.MEEP_DLG_SAVE_REPLAY, 'Ok');

    cy.wait(1000);

    cy.wait(2000);

    //no way to check except by executing auto-replay test that gets the file

    //click away from auto-replay pane to make sure drop-down menu is correctly populated

    click(meep.EXEC_BTN_EVENT_BTN_MANUAL_REPLAY);

    click(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY);

    cy.wait(1000);

    select(meep.EXEC_BTN_EVENT_BTN_AUTO_REPLAY_EVT_REPLAY_FILES, name);