(streampipes) branch 2843-nhance-user-handling-in-cypress-tests updated: refactor(#2843): Refactor test deleteAdapterWithMultipleUsers.smoke.spec.ts

[zehnder]

This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch 2843-nhance-user-handling-in-cypress-tests
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to 
refs/heads/2843-nhance-user-handling-in-cypress-tests by this push:
     new e1a446e3d8 refactor(#2843): Refactor test 
deleteAdapterWithMultipleUsers.smoke.spec.ts
e1a446e3d8 is described below

commit e1a446e3d8d4e284d543cb866461847f26c50037
Author: Philipp Zehnder <ten...@users.noreply.github.com>
AuthorDate: Thu May 9 21:13:55 2024 +0200

    refactor(#2843): Refactor test deleteAdapterWithMultipleUsers.smoke.spec.ts
---
 ui/cypress/support/general/login.ts                | 11 ++-----
 .../deleteAdapterWithMultipleUsers.smoke.spec.ts   | 34 +++++-----------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/ui/cypress/support/general/login.ts 
b/ui/cypress/support/general/login.ts
index 13be5dc188..22452a5daa 100644
--- a/ui/cypress/support/general/login.ts
+++ b/ui/cypress/support/general/login.ts
@@ -19,7 +19,6 @@
 import '@angular/compiler';
 import { UserUtils } from '../utils/UserUtils';
 import { JwtHelperService } from '@auth0/angular-jwt';
-import { User } from '../model/User';
 
 declare global {
     namespace Cypress {
@@ -33,13 +32,10 @@ declare global {
     }
 }
 
-export const login = (user?: User) => {
-    let _user;
-    _user = !user ? UserUtils.adminUser : user;
-
+export const login = (user = UserUtils.adminUser) => {
     cy.request('POST', '/streampipes-backend/api/v2/auth/login', {
-        username: _user.email,
-        password: _user.password,
+        username: user.email,
+        password: user.password,
     }).then(res => {
         const decodedToken = new JwtHelperService({}).decodeToken(
             res.body.accessToken,
@@ -49,6 +45,5 @@ export const login = (user?: User) => {
             JSON.stringify(decodedToken.user),
         );
         window.localStorage.setItem('auth-token', res.body.accessToken);
-        console.log(user);
     });
 };
diff --git 
a/ui/cypress/tests/adapter/deleteAdapterWithMultipleUsers.smoke.spec.ts 
b/ui/cypress/tests/adapter/deleteAdapterWithMultipleUsers.smoke.spec.ts
index 6583712b94..29c854cb23 100644
--- a/ui/cypress/tests/adapter/deleteAdapterWithMultipleUsers.smoke.spec.ts
+++ b/ui/cypress/tests/adapter/deleteAdapterWithMultipleUsers.smoke.spec.ts
@@ -16,7 +16,6 @@
  *
  */
 
-import { AdapterBuilder } from '../../support/builder/AdapterBuilder';
 import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
 import { PipelineBuilder } from '../../support/builder/PipelineBuilder';
 import { PipelineElementBuilder } from 
'../../support/builder/PipelineElementBuilder';
@@ -25,11 +24,6 @@ import { PipelineUtils } from 
'../../support/utils/PipelineUtils';
 
 const adapterName = 'simulator';
 
-const adapterInput = AdapterBuilder.create('Machine_Data_Simulator')
-    .setName(adapterName)
-    .addInput('input', 'wait-time-ms', '1000')
-    .build();
-
 const pipelineInput = PipelineBuilder.create('Pipeline Test')
     .addSource(adapterName)
     .addProcessingElement(
@@ -46,37 +40,23 @@ const pipelineInput = PipelineBuilder.create('Pipeline 
Test')
     .build();
 
 describe('Test Enhanced Adapter Deletion', () => {
-    // In the beginning, create the non-admin user
-    before(() => {
+    beforeEach('Setup Test', () => {
         cy.initStreamPipesTest();
         UserUtils.addUser(UserUtils.userWithAdapterAndPipelineAdminRights);
-        cy.logout();
-    });
-
-    beforeEach('Setup Test', () => {
-        cy.visit('#/login');
-        cy.dataCy('login-email').type(
-            UserUtils.userWithAdapterAndPipelineAdminRights.email,
-        );
-        cy.dataCy('login-password').type(
-            UserUtils.userWithAdapterAndPipelineAdminRights.password,
-        );
-        cy.dataCy('login-button').click();
-        cy.wait(1000);
     });
 
     it('Test Delete Adapter and Associated Pipelines', () => {
-        ConnectUtils.testAdapter(adapterInput);
-        PipelineUtils.addPipeline(pipelineInput);
+        ConnectUtils.addMachineDataSimulator(adapterName, false);
         PipelineUtils.addPipeline(pipelineInput);
+
         ConnectUtils.deleteAdapterAndAssociatedPipelines();
     });
 
     it('Test Admin Should Be Able to Delete Adapter and Not Owned Associated 
Pipelines', () => {
         // Let the user create the adapter and the pipeline
-        ConnectUtils.testAdapter(adapterInput);
-        PipelineUtils.addPipeline(pipelineInput);
+        ConnectUtils.addMachineDataSimulator(adapterName, false);
         PipelineUtils.addPipeline(pipelineInput);
+
         // Then let the admin delete them
         UserUtils.switchUser(UserUtils.adminUser);
         ConnectUtils.deleteAdapterAndAssociatedPipelines(true);
@@ -85,9 +65,9 @@ describe('Test Enhanced Adapter Deletion', () => {
     it('Test Delete Adapter and Associated Pipelines Permission Denied', () => 
{
         // Let the admin create the adapter and the pipeline
         UserUtils.switchUser(UserUtils.adminUser);
-        ConnectUtils.testAdapter(adapterInput);
-        PipelineUtils.addPipeline(pipelineInput);
+        ConnectUtils.addMachineDataSimulator(adapterName, false);
         PipelineUtils.addPipeline(pipelineInput);
+
         // Then the user shouldn't be able to delete them
         UserUtils.switchUser(UserUtils.userWithAdapterAndPipelineAdminRights);
         ConnectUtils.deleteAdapterAndAssociatedPipelinesPermissionDenied();