SONAR-21010 Splitting combine facet test and reducing jest timeout limit

diff --git a/server/sonar-web/design-system/jest.config.js b/server/sonar-web/design-system/jest.config.js
index a2399e4f397a8573c7f8bdfbfb14ded4d55c1362..cc733556bd0d47feb9fea0218b927c5bc013aa82 100644 (file)
--- a/server/sonar-web/design-system/jest.config.js
+++ b/server/sonar-web/design-system/jest.config.js
@@ -72,5 +72,5 @@ module.exports = {
       },
     ],
   ],
-  testTimeout: 60000,
+  testTimeout: 40000,
 };

diff --git a/server/sonar-web/jest.config.js b/server/sonar-web/jest.config.js
index 1ef13f275412edbbb3f63d35f489427e68ee453a..1e8714181d40c4fac7a3c813d3618785b14deafc 100644 (file)
--- a/server/sonar-web/jest.config.js
+++ b/server/sonar-web/jest.config.js
@@ -58,5 +58,5 @@ module.exports = {
     ],
     ['jest-slow-test-reporter', { numTests: 5, warnOnSlowerThan: 10000, color: true }],
   ],
-  testTimeout: 60000,
+  testTimeout: 40000,
 };

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/__tests__/CodingRules-it.ts b/server/sonar-web/src/main/js/apps/coding-rules/__tests__/CodingRules-it.ts
index f2f5703dba4b6e53c9949c2168e0429edc67ad92..8b4fe4e8b59ebeaee72b0c6fde537b1cc51df0cb 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/__tests__/CodingRules-it.ts
+++ b/server/sonar-web/src/main/js/apps/coding-rules/__tests__/CodingRules-it.ts
@@ -135,11 +135,13 @@ describe('Rules app list', () => {
       });
 
       expect(ui.getAllRuleListItems()).toHaveLength(1);
+    });
+
+    it('filter by repository', async () => {
+      const { ui, user } = getPageObjects();
+      renderCodingRulesApp(mockCurrentUser());
+      await ui.appLoaded();
 
-      // Clear filters
-      await act(async () => {
-        await user.click(ui.clearAllFiltersButton.get());
-      });
       expect(ui.getAllRuleListItems()).toHaveLength(11);
 
       // Filter by repository
@@ -155,11 +157,13 @@ describe('Rules app list', () => {
         await user.click(ui.facetItem('Repository 2').get());
       });
       expect(ui.getAllRuleListItems()).toHaveLength(1);
+    });
+
+    it('filter by quality profile, tag and search by tag', async () => {
+      const { ui, user } = getPageObjects();
+      renderCodingRulesApp(mockCurrentUser());
+      await ui.appLoaded();
 
-      // Clear filters
-      await act(async () => {
-        await user.click(ui.clearAllFiltersButton.get());
-      });
       expect(ui.getAllRuleListItems()).toHaveLength(11);
 
       // Filter by quality profile
@@ -182,13 +186,14 @@ describe('Rules app list', () => {
         await user.type(ui.facetSearchInput('search.search_for_tags').get(), 'te');
       });
       expect(ui.facetItem('cute').get()).toHaveAttribute('aria-disabled', 'true');
+    });
 
-      // Clear all filters
-      await act(async () => {
-        await user.click(ui.clearAllFiltersButton.get());
-      });
-      expect(ui.getAllRuleListItems()).toHaveLength(11);
+    it('filter by clean code category, software quality and severity', async () => {
+      const { ui, user } = getPageObjects();
+      renderCodingRulesApp(mockCurrentUser());
+      await ui.appLoaded();
 
+      expect(ui.getAllRuleListItems()).toHaveLength(11);
       // Filter by clean code category
       await act(async () => {
         await user.click(ui.facetItem('issue.clean_code_attribute_category.ADAPTABLE').get());