import { PageHelper } from '../page-helper.po';
+const WAIT_TIMER = 500;
const pages = {
index: { url: '#/rgw/bucket', id: 'cd-rgw-bucket-list' },
create: { url: '#/rgw/bucket/create', id: 'cd-rgw-bucket-form' }
}
// Click the create button and wait for bucket to be made
- cy.contains('button', 'Create Bucket').click();
+ cy.contains('button', 'Create Bucket').wait(WAIT_TIMER).click();
this.getFirstTableCell(name).should('exist');
}
cy.get('label[for=versioning]').click();
cy.get('input[id=versioning]').should('not.be.checked');
- cy.contains('button', 'Edit Bucket').click();
+ cy.contains('button', 'Edit Bucket').wait(WAIT_TIMER).click();
// Check versioning suspended:
this.getExpandCollapseElement(name).click();
// Gives an invalid name (too short), then waits for dashboard to determine validity
cy.get('@nameInputField').type('rq');
- cy.contains('button', 'Create Bucket').click(); // To trigger a validation
+ cy.contains('button', 'Create Bucket').wait(WAIT_TIMER).click(); // To trigger a validation
// Waiting for website to decide if name is valid or not
// Check that name input field was marked invalid in the css
// Clicks the Create Bucket button but the page doesn't move.
// Done by testing for the breadcrumb
- cy.contains('button', 'Create Bucket').click(); // Clicks Create Bucket button
+ cy.contains('button', 'Create Bucket').wait(WAIT_TIMER).click(); // Clicks Create Bucket button
this.expectBreadcrumbText('Create');
// content in fields seems to subsist through tests if not cleared, so it is cleared
cy.get('@nameInputField').clear();
submit() {
// Exit immediately if the form isn't dirty.
- if (this.bucketForm.getValue('encryption_enabled') == null) {
- this.bucketForm.get('encryption_enabled').setValue(false);
- this.bucketForm.get('encryption_type').setValue(null);
- }
if (this.bucketForm.pristine) {
this.goToListView();
return;
}
+
+ // Ensure that no validation is pending
+ if (this.bucketForm.pending) {
+ this.bucketForm.setErrors({ cdSubmitButton: true });
+ return;
+ }
+
+ if (this.bucketForm.getValue('encryption_enabled') == null) {
+ this.bucketForm.get('encryption_enabled').setValue(false);
+ this.bucketForm.get('encryption_type').setValue(null);
+ }
+
const values = this.bucketForm.value;
const xmlStrTags = this.tagsToXML(this.tags);
const bucketPolicy = this.getBucketPolicy();
import { RgwUserCapability } from '../models/rgw-user-capability';
import { RgwUserS3Key } from '../models/rgw-user-s3-key';
import { RgwUserFormComponent } from './rgw-user-form.component';
+import { DUE_TIMER } from '~/app/shared/forms/cd-validators';
describe('RgwUserFormComponent', () => {
let component: RgwUserFormComponent;
it('should validate that username is valid', fakeAsync(() => {
spyOn(rgwUserService, 'get').and.returnValue(throwError('foo'));
formHelper.setValue('user_id', 'ab', true);
- tick();
+ tick(DUE_TIMER);
formHelper.expectValid('user_id');
}));
it('should validate that username is invalid', fakeAsync(() => {
spyOn(rgwUserService, 'get').and.returnValue(observableOf({}));
formHelper.setValue('user_id', 'abc', true);
- tick();
+ tick(DUE_TIMER);
formHelper.expectError('user_id', 'notUnique');
}));
});
import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service';
import { CdFormGroup } from '~/app/shared/forms/cd-form-group';
-import { CdValidators } from '~/app/shared/forms/cd-validators';
+import { CdValidators, DUE_TIMER } from '~/app/shared/forms/cd-validators';
import { FormHelper } from '~/testing/unit-test-helper';
let mockBucketExists = observableOf(true);
describe('bucket', () => {
const testValidator = (name: string, valid: boolean, expectedError?: string) => {
formHelper.setValue('x', name, true);
- tick();
+ tick(DUE_TIMER);
if (valid) {
formHelper.expectValid('x');
} else {
export type existsServiceFn = (value: any, ...args: any[]) => Observable<boolean>;
+export const DUE_TIMER = 500;
+
export class CdValidators {
/**
* Validator that performs email validation. In contrast to the Angular
* boolean 'true' if the given value exists, otherwise 'false'.
* @param serviceFnThis {any} The object to be used as the 'this' object
* when calling the serviceFn function. Defaults to null.
- * @param {number|Date} dueTime The delay time to wait before the
- * serviceFn call is executed. This is useful to prevent calls on
- * every keystroke. Defaults to 500.
+ * @param usernameFn {Function} Specifically used in rgw user form to
+ * validate the tenant$username format
+ * @param uidField {boolean} Specifically used in rgw user form to
+ * validate the tenant$username format
+ * @param extraArgs {...any} Any extra arguments that need to be passed
+ * to the serviceFn function.
* @return {AsyncValidatorFn} Returns an asynchronous validator function
* that returns an error map with the `notUnique` property if the
* validation check succeeds, otherwise `null`.
}
}
- return observableTimer().pipe(
+ return observableTimer(DUE_TIMER).pipe(
switchMapTo(serviceFn.call(serviceFnThis, uName, ...extraArgs)),
map((resp: boolean) => {
if (!resp) {
if (_.isFunction(usernameFn)) {
username = usernameFn();
}
- return observableTimer(500).pipe(
+ return observableTimer(DUE_TIMER).pipe(
switchMapTo(_.invoke(userServiceThis, 'validatePassword', control.value, username)),
map((resp: { valid: boolean; credits: number; valuation: string }) => {
if (_.isFunction(callback)) {
if (control.pristine || !control.value) {
return observableOf({ required: true });
}
- return rgwBucketService
- .exists(control.value)
- .pipe(
- map((existenceResult: boolean) =>
- existenceResult === requiredExistenceResult ? null : { bucketNameNotAllowed: true }
- )
- );
+ return observableTimer(DUE_TIMER).pipe(
+ switchMapTo(rgwBucketService.exists(control.value)),
+ map((existenceResult: boolean) =>
+ existenceResult === requiredExistenceResult ? null : { bucketNameNotAllowed: true }
+ )
+ );
};
}
projects / ceph.git / commitdiff