added some more test cases to validated FQDN field inputs

Signed-off-by: Sachin Bachhav <[email protected]>
chef · Jan 29, 2020 · 202f229 · 202f229
1 parent dac3d1a
commit 202f229
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/components/automate-ui/src/app/helpers/auth/regex.ts b/components/automate-ui/src/app/helpers/auth/regex.ts
@@ -23,8 +23,7 @@ export class Regex {
     NO_MIXED_WILDCARD_ALLOW_SPECIAL: '^(\\*|[^:*]+)$',
 
     // Allows valid FQDN only
-    VALID_FQDN: '^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-zA-Z0-9_]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,5}(:[0-9]{1,5})?(\/.*)?$',
-
+    VALID_FQDN: /^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-zA-Z0-9_]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,5}(:[0-9]{1,5})?(\/.*)?$/,
     // Allows valid IP Address only (ipv4)
     VALID_IP_ADDRESS: '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'
   };

diff --git a/...mate-ui/src/app/modules/infra-proxy/chef-servers-list/chef-servers-list.component.spec.ts b/...mate-ui/src/app/modules/infra-proxy/chef-servers-list/chef-servers-list.component.spec.ts
@@ -187,6 +187,10 @@ describe('ChefServersListComponent', () => {
       errors = fqdn.errors || {};
       expect(errors['pattern']).toBeTruthy();
 
+      fqdn.setValue('http://...foo.bar com/');
+      errors = fqdn.errors || {};
+      expect(errors['pattern']).toBeTruthy();
+
       // Set fqdn to valid inputs
       fqdn.setValue('http://fo_o.bar/');
       errors = fqdn.errors || {};
@@ -196,6 +200,14 @@ describe('ChefServersListComponent', () => {
       errors = fqdn.errors || {};
       expect(errors['pattern']).toBeFalsy();
 
+      fqdn.setValue('http://demo.com/');
+      errors = fqdn.errors || {};
+      expect(errors['pattern']).toBeFalsy();
+
+      fqdn.setValue('https://example_test.co.in/2OWGwiL');
+      errors = fqdn.errors || {};
+      expect(errors['pattern']).toBeFalsy();
+
     });
   });
 });