-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…Extend reset REST endpoint to remove users (#2197) * implement unit tests for enhanced adapter deletion * better structure * fix * delete other users in reset * change comment
- Loading branch information
Showing
5 changed files
with
195 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,15 @@ export class UserUtils { | |
| .addRole(UserRole.ROLE_ADMIN) | ||
| .build(); | ||
|
|
||
| public static adapterAndPipelineAdminUser = UserBuilder.create( | ||
| '[email protected]', | ||
| ) | ||
| .setName('anpadmin') | ||
| .setPassword('anpadmin') | ||
| .addRole(UserRole.ROLE_PIPELINE_ADMIN) | ||
| .addRole(UserRole.ROLE_CONNECT_ADMIN) | ||
| .build(); | ||
|
|
||
| public static goToUserConfiguration() { | ||
| cy.visit('#/configuration/security'); | ||
| } | ||
|
|
@@ -42,9 +51,11 @@ export class UserUtils { | |
| cy.dataCy('new-user-password-repeat').type(user.password); | ||
|
|
||
| // Set role | ||
| cy.dataCy('role-' + user.role[0]) | ||
| .children() | ||
| .click(); | ||
| for (var i = 0; i < user.role.length; i++) { | ||
| cy.dataCy('role-' + user.role[i]) | ||
| .children() | ||
| .click(); | ||
| } | ||
| cy.dataCy('new-user-enabled').children().click(); | ||
|
|
||
| // Store | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
ui/cypress/tests/adapter/enhancedDeleteAdapter.smoke.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| 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'; | ||
| import { UserUtils } from '../../support/utils/UserUtils'; | ||
| 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( | ||
| PipelineElementBuilder.create('field_renamer') | ||
| .addInput('drop-down', 'convert-property', 'timestamp') | ||
| .addInput('input', 'field-name', 't') | ||
| .build(), | ||
| ) | ||
| .addSink( | ||
| PipelineElementBuilder.create('data_lake') | ||
| .addInput('input', 'db_measurement', 'demo') | ||
| .build(), | ||
| ) | ||
| .build(); | ||
|
|
||
| describe('Test Enhanced Adapter Deletion', () => { | ||
| // In the beginning, create the non-admin user | ||
| before(() => { | ||
| cy.initStreamPipesTest(); | ||
| UserUtils.addUser(UserUtils.adapterAndPipelineAdminUser); | ||
| cy.logout(); | ||
| }); | ||
|
|
||
| beforeEach('Setup Test', () => { | ||
| cy.visit('#/login'); | ||
| cy.dataCy('login-email').type( | ||
| UserUtils.adapterAndPipelineAdminUser.email, | ||
| ); | ||
| cy.dataCy('login-password').type( | ||
| UserUtils.adapterAndPipelineAdminUser.password, | ||
| ); | ||
| cy.dataCy('login-button').click(); | ||
| cy.wait(1000); | ||
| }); | ||
|
|
||
| it('Test Delete Adapter and Associated Pipelines', () => { | ||
| ConnectUtils.testAdapter(adapterInput); | ||
| PipelineUtils.addPipeline(pipelineInput); | ||
| 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); | ||
| PipelineUtils.addPipeline(pipelineInput); | ||
| // Then let the admin delete them | ||
| cy.switchUser(UserUtils.adminUser); | ||
| ConnectUtils.deleteAdapterAndAssociatedPipelines(true); | ||
| }); | ||
|
|
||
| it('Test Delete Adapter and Associated Pipelines Permission Denied', () => { | ||
| // Let the admin create the adapter and the pipeline | ||
| cy.switchUser(UserUtils.adminUser); | ||
| ConnectUtils.testAdapter(adapterInput); | ||
| PipelineUtils.addPipeline(pipelineInput); | ||
| PipelineUtils.addPipeline(pipelineInput); | ||
| // Then the user shouldn't be able to delete them | ||
| cy.switchUser(UserUtils.adapterAndPipelineAdminUser); | ||
| ConnectUtils.deleteAdapterAndAssociatedPipelinesPermissionDenied(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters