Remove hardcoded catid's in tests (#40988)

laoneo · web-flow · commit 1811f78f8d46 · 2023-06-20T08:20:14.000+02:00
* Remove hardcoded catid's in tests

* cs

* slash
diff --git a/tests/System/integration/administrator/components/com_banners/Banner.cy.js b/tests/System/integration/administrator/components/com_banners/Banner.cy.js
@@ -1,5 +1,9 @@
 describe('Test in backend that the banners form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_banners&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__banners WHERE name = 'Test banner'"));
 
   it('can create a banner', () => {
@@ -12,16 +16,16 @@ describe('Test in backend that the banners form', () => {
   });
 
   it('check redirection to list view', () => {
-    cy.visit('administrator/index.php?option=com_banners&task=banner.add');
+    cy.visit('/administrator/index.php?option=com_banners&task=banner.add');
     cy.intercept('index.php?option=com_banners&view=banners').as('listview');
     cy.clickToolbarButton('Cancel');
 
     cy.wait('@listview');
   });
 
   it('can edit a banner', () => {
-    cy.db_createBanner({ name: 'Test Banner' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_banners&task=banner.edit&id=${id}`);
+    cy.db_createBanner({ name: 'Test Banner' }).then((banner) => {
+      cy.visit(`/administrator/index.php?option=com_banners&task=banner.edit&id=${banner.id}`);
       cy.get('#jform_name').clear().type('Test banner edited');
       cy.clickToolbarButton('Save & Close');
 
diff --git a/tests/System/integration/administrator/components/com_categories/Category.cy.js b/tests/System/integration/administrator/components/com_categories/Category.cy.js
@@ -1,5 +1,9 @@
 describe('Test in backend that the category form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_categories&extension=com_content&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__categories WHERE title = 'Test category'"));
 
   it('can create a category', () => {
@@ -13,7 +17,7 @@ describe('Test in backend that the category form', () => {
 
   it('can change access level of a test category', () => {
     cy.db_createCategory({ title: 'Test category' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_categories&task=category.edit&id=${id}&extension=com_content`);
+      cy.visit(`/administrator/index.php?option=com_categories&task=category.edit&id=${id}&extension=com_content`);
       cy.get('#jform_access').select('Special');
       cy.clickToolbarButton('Save & Close');
 
@@ -22,7 +26,7 @@ describe('Test in backend that the category form', () => {
   });
 
   it('check redirection to list view', () => {
-    cy.visit('administrator/index.php?option=com_categories&task=category.add&extension=com_content');
+    cy.visit('/administrator/index.php?option=com_categories&task=category.add&extension=com_content&filter[published]=');
     cy.intercept('index.php?option=com_categories&view=categories&extension=com_content').as('listview');
     cy.clickToolbarButton('Cancel');
 
diff --git a/tests/System/integration/administrator/components/com_contact/Contact.cy.js b/tests/System/integration/administrator/components/com_contact/Contact.cy.js
@@ -1,5 +1,9 @@
 describe('Test in backend that the contact form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_contact&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__contact_details WHERE name = 'Test contact'"));
 
   it('can create a contact', () => {
@@ -12,8 +16,8 @@ describe('Test in backend that the contact form', () => {
   });
 
   it('can change access level of a test contact', () => {
-    cy.db_createContact({ name: 'Test contact' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_contact&task=contact.edit&id=${id}`);
+    cy.db_createContact({ name: 'Test contact' }).then((contact) => {
+      cy.visit(`/administrator/index.php?option=com_contact&task=contact.edit&id=${contact.id}`);
       cy.get('#jform_access').select('Special');
       cy.clickToolbarButton('Save & Close');
 
@@ -22,7 +26,7 @@ describe('Test in backend that the contact form', () => {
   });
 
   it('check redirection to list view', () => {
-    cy.visit('administrator/index.php?option=com_contact&task=contact.add');
+    cy.visit('/administrator/index.php?option=com_contact&task=contact.add');
     cy.intercept('index.php?option=com_contact&view=contacts').as('listview');
     cy.clickToolbarButton('Cancel');
 
diff --git a/tests/System/integration/administrator/components/com_content/Article.cy.js b/tests/System/integration/administrator/components/com_content/Article.cy.js
@@ -1,5 +1,9 @@
 describe('Test in backend that the article form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_content&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__content WHERE title = 'Test article'"));
 
   it('can create an article', () => {
@@ -12,8 +16,8 @@ describe('Test in backend that the article form', () => {
   });
 
   it('can change access level of a test article', () => {
-    cy.db_createArticle({ title: 'Test article' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_content&task=article.edit&id=${id}`);
+    cy.db_createArticle({ title: 'Test article' }).then((article) => {
+      cy.visit(`/administrator/index.php?option=com_content&task=article.edit&id=${article.id}`);
       cy.get('#jform_access').select('Special');
       cy.clickToolbarButton('Save & Close');
 
@@ -22,7 +26,7 @@ describe('Test in backend that the article form', () => {
   });
 
   it('check redirection to list view', () => {
-    cy.visit('administrator/index.php?option=com_content&task=article.add');
+    cy.visit('/administrator/index.php?option=com_content&task=article.add');
     cy.intercept('index.php?option=com_content&view=articles').as('listview');
     cy.clickToolbarButton('Cancel');
 
diff --git a/tests/System/integration/administrator/components/com_fields/Field.cy.js b/tests/System/integration/administrator/components/com_fields/Field.cy.js
@@ -1,5 +1,9 @@
 describe('Test in backend that the field form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_fields&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__fields WHERE title = 'Test field'"));
 
   it('can create a field', () => {
@@ -12,7 +16,7 @@ describe('Test in backend that the field form', () => {
   });
 
   it('check redirection to list view', () => {
-    cy.visit('administrator/index.php?option=com_fields&task=field.add&context=com_content.article');
+    cy.visit('/administrator/index.php?option=com_fields&task=field.add&context=com_content.article');
     cy.intercept('index.php?option=com_fields&view=fields&context=com_content.article').as('listview');
     cy.clickToolbarButton('Cancel');
 
@@ -21,7 +25,7 @@ describe('Test in backend that the field form', () => {
 
   it('can edit a field', () => {
     cy.db_createField({ title: 'Test field' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_fields&task=field.edit&id=${id}&context=com_content.article`);
+      cy.visit(`/administrator/index.php?option=com_fields&task=field.edit&id=${id}&context=com_content.article`);
       cy.get('#jform_title').clear().type('Test field edited');
       cy.clickToolbarButton('Save & Close');
 
diff --git a/tests/System/integration/administrator/components/com_modules/Module.cy.js b/tests/System/integration/administrator/components/com_modules/Module.cy.js
@@ -1,5 +1,9 @@
 describe('Test in backend that the module form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_modules&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__modules WHERE title = 'Test module'"));
 
   it('can create a module', () => {
@@ -17,10 +21,6 @@ describe('Test in backend that the module form', () => {
       cy.get('#jform_title').clear().type('Test module edited');
       cy.clickToolbarButton('Save & Close');
 
-      // This is needed as it can be that the backend list still has a filter active
-      cy.visit('/administrator/index.php?option=com_modules&view=modules&filter=');
-      cy.reload();
-
       cy.contains('Test module edited');
     });
   });
diff --git a/tests/System/integration/administrator/components/com_newsfeeds/Newsfeed.cy.js b/tests/System/integration/administrator/components/com_newsfeeds/Newsfeed.cy.js
@@ -13,8 +13,8 @@ describe('Test in backend that the newsfeed form', () => {
   });
 
   it('can change access level of a test newsfeed', () => {
-    cy.db_createNewsFeed({ name: 'Test newsfeed', link: 'https://newsfeedtesturl' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_newsfeeds&task=newsfeed.edit&id=${id}`);
+    cy.db_createNewsFeed({ name: 'Test newsfeed', link: 'https://newsfeedtesturl' }).then((feed) => {
+      cy.visit(`/administrator/index.php?option=com_newsfeeds&task=newsfeed.edit&id=${feed.id}`);
       cy.get('#jform_access').select('Special');
       cy.clickToolbarButton('Save & Close');
 
diff --git a/tests/System/integration/administrator/components/com_tags/Tag.cy.js b/tests/System/integration/administrator/components/com_tags/Tag.cy.js
@@ -1,5 +1,9 @@
 describe('Test in backend that the tag form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_tags&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__tags WHERE title = 'Test tag'"));
 
   it('can create a tag', () => {
@@ -13,7 +17,7 @@ describe('Test in backend that the tag form', () => {
 
   it('can edit a tag', () => {
     cy.db_createTag({ title: 'Test tag' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_tags&task=tag.edit&id=${id}`);
+      cy.visit(`/administrator/index.php?option=com_tags&task=tag.edit&id=${id}`);
       cy.get('#jform_title').clear().type('Test tag edited');
       cy.clickToolbarButton('Save & Close');
 
@@ -22,7 +26,7 @@ describe('Test in backend that the tag form', () => {
   });
 
   it('check redirection to list view', () => {
-    cy.visit('administrator/index.php?option=com_tags&task=tag.add');
+    cy.visit('/administrator/index.php?option=com_tags&task=tag.add');
     cy.intercept('index.php?option=com_tags&view=tags').as('listview');
     cy.clickToolbarButton('Cancel');
 
diff --git a/tests/System/integration/administrator/components/com_users/User.cy.js b/tests/System/integration/administrator/components/com_users/User.cy.js
@@ -18,7 +18,7 @@ describe('Test in backend that the user form', () => {
 
   it('can edit a user', () => {
     cy.db_createUser().then((id) => {
-      cy.visit(`administrator/index.php?option=com_users&task=user.edit&id=${id}`);
+      cy.visit(`/administrator/index.php?option=com_users&task=user.edit&id=${id}`);
 
       cy.get('#jform_name').clear().type('test edited');
       cy.get('#jform_username').clear().type('testedited');
diff --git a/tests/System/integration/api/com_banners/Banners.cy.js b/tests/System/integration/api/com_banners/Banners.cy.js
@@ -30,14 +30,14 @@ describe('Test that banners API endpoint', () => {
 
   it('can update a banner', () => {
     cy.db_createBanner({ name: 'automated test banner' })
-      .then((id) => cy.api_patch(`/banners/${id}`, { name: 'updated automated test banner' }))
+      .then((banner) => cy.api_patch(`/banners/${banner.id}`, { name: 'updated automated test banner' }))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('name')
         .should('include', 'updated automated test banner'));
   });
 
   it('can delete a banner', () => {
     cy.db_createBanner({ name: 'automated test banner', state: -2 })
-      .then((id) => cy.api_delete(`/banners/${id}`));
+      .then((banner) => cy.api_delete(`/banners/${banner.id}`));
   });
 });
diff --git a/tests/System/integration/api/com_contact/Contacts.cy.js b/tests/System/integration/api/com_contact/Contacts.cy.js
@@ -25,14 +25,14 @@ describe('Test that contacts API endpoint', () => {
 
   it('can update a contact', () => {
     cy.db_createContact({ name: 'automated test contact', access: 1 })
-      .then((id) => cy.api_patch(`/contacts/${id}`, { name: 'updated automated test contact' }))
+      .then((contact) => cy.api_patch(`/contacts/${contact.id}`, { name: 'updated automated test contact' }))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('name')
         .should('include', 'updated automated test contact'));
   });
 
   it('can delete a contact', () => {
     cy.db_createContact({ name: 'automated test contact', published: -2 })
-      .then((id) => cy.api_delete(`/contacts/${id}`));
+      .then((contact) => cy.api_delete(`/contacts/${contact.id}`));
   });
 });
diff --git a/tests/System/integration/api/com_content/Articles.cy.js b/tests/System/integration/api/com_content/Articles.cy.js
@@ -35,13 +35,14 @@ describe('Test that content API endpoint', () => {
 
   it('can update an article', () => {
     cy.db_createArticle({ title: 'automated test article' })
-      .then((id) => cy.api_patch(`/content/articles/${id}`, { title: 'updated automated test article' }))
+      .then((article) => cy.api_patch(`/content/articles/${article.id}`, { title: 'updated automated test article' }))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('title')
         .should('include', 'updated automated test article'));
   });
 
   it('can delete an article', () => {
-    cy.db_createArticle({ title: 'automated test article', state: -2 }).then((id) => cy.api_delete(`/content/articles/${id}`));
+    cy.db_createArticle({ title: 'automated test article', state: -2 })
+      .then((article) => cy.api_delete(`/content/articles/${article.id}`));
   });
 });
diff --git a/tests/System/integration/api/com_newsfeed/NewsFeed.cy.js b/tests/System/integration/api/com_newsfeed/NewsFeed.cy.js
@@ -55,7 +55,7 @@ describe('Test that newsfeed API endpoint', () => {
 
     it('can update a feed', () => {
       cy.db_createNewsFeed({ name: 'automated test contact', access: 1, link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml` })
-        .then((id) => cy.api_patch(`/newsfeeds/feeds/${id}`, { name: 'updated automated test feed' }))
+        .then((feed) => cy.api_patch(`/newsfeeds/feeds/${feed.id}`, { name: 'updated automated test feed' }))
         .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
           .its('name')
           .should('include', 'updated automated test feed'));
@@ -65,7 +65,7 @@ describe('Test that newsfeed API endpoint', () => {
       cy.db_createNewsFeed({
         name: 'automated test contact', access: 1, link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml`, published: -2,
       })
-        .then((id) => cy.api_delete(`/newsfeeds/feeds/${id}`));
+        .then((feed) => cy.api_delete(`/newsfeeds/feeds/${feed.id}`));
     });
   });
 });
diff --git a/tests/System/integration/site/components/com_contact/Category.cy.js b/tests/System/integration/site/components/com_contact/Category.cy.js
@@ -18,11 +18,11 @@ describe('Test in frontend that the contact category view', () => {
 
   it('can display a list of contacts without a menu item', () => {
     cy.db_createContact({ name: 'automated test contact 1' })
-      .then(() => cy.db_createContact({ name: 'automated test contact 2' }))
-      .then(() => cy.db_createContact({ name: 'automated test contact 3' }))
-      .then(() => cy.db_createContact({ name: 'automated test contact 4' }))
-      .then(() => {
-        cy.visit('/index.php?option=com_contact&view=category&id=4');
+      .then((contact) => cy.db_createContact({ name: 'automated test contact 2', featured: 1, catid: contact.catid }))
+      .then((contact) => cy.db_createContact({ name: 'automated test contact 3', featured: 1, catid: contact.catid }))
+      .then((contact) => cy.db_createContact({ name: 'automated test contact 4', featured: 1, catid: contact.catid }))
+      .then((contact) => {
+        cy.visit(`/index.php?option=com_contact&view=category&id=${contact.catid}`);
 
         cy.contains('automated test contact 1');
         cy.contains('automated test contact 2');
@@ -33,7 +33,7 @@ describe('Test in frontend that the contact category view', () => {
 
   it('can open the contact form in the default layout', () => {
     cy.db_createContact({ name: 'contact 1' })
-      .then(() => cy.db_createMenuItem({ title: 'automated test', link: 'index.php?option=com_contact&view=category&id=4' }))
+      .then((contact) => cy.db_createMenuItem({ title: 'automated test', link: `index.php?option=com_contact&view=category&id=${contact.catid}` }))
       .then(() => {
         cy.doFrontendLogin();
         cy.visit('/');
diff --git a/tests/System/integration/site/components/com_contact/Contact.cy.js b/tests/System/integration/site/components/com_contact/Contact.cy.js
@@ -1,8 +1,8 @@
 describe('Test in frontend that the contact details view', () => {
   it('can display a form', () => {
     cy.db_getUserId().then((id) => cy.db_createContact({ name: 'contact 1', user_id: id }))
-      .then((contactId) => {
-        cy.visit(`index.php?option=com_contact&view=contact&id='${contactId}'`);
+      .then((contact) => {
+        cy.visit(`/index.php?option=com_contact&view=contact&id='${contact.id}'`);
 
         cy.contains('Contact Form');
         cy.get('.m-0').should('exist');
@@ -16,8 +16,8 @@ describe('Test in frontend that the contact details view', () => {
       }))
       .then(() => cy.db_getUserId())
       .then((userId) => cy.db_createContact({ name: 'automated test contact 1', user_id: userId }))
-      .then((contactId) => {
-        cy.visit(`index.php?option=com_contact&view=contact&id='${contactId}'`);
+      .then((contact) => {
+        cy.visit(`/index.php?option=com_contact&view=contact&id='${contact.id}'`);
 
         cy.contains('automated test_field group').should('exist');
         cy.contains('test field').should('exist');
diff --git a/tests/System/integration/site/components/com_contact/Form.cy.js b/tests/System/integration/site/components/com_contact/Form.cy.js
@@ -6,8 +6,11 @@ describe('Test in frontend that the contact form view', () => {
     cy.visit('/index.php?option=com_contact&view=form&layout=edit');
     cy.get('#jform_name').type('test contact 1');
     cy.get('.mb-2 > .btn-primary').click();
-    cy.visit('/index.php?option=com_contact&view=category&id=4');
 
-    cy.contains('test contact 1').should('exist');
+    cy.task('queryDB', 'SELECT catid FROM #__contact_details WHERE name = \'test contact 1\'').then((id) => {
+      cy.visit(`/index.php?option=com_contact&view=category&id=${id[0].catid}`);
+
+      cy.contains('test contact 1').should('exist');
+    });
   });
 });
diff --git a/tests/System/integration/site/components/com_content/Article.cy.js b/tests/System/integration/site/components/com_content/Article.cy.js
@@ -17,7 +17,7 @@ describe('Test in frontend that the content article form', () => {
 
   it('can edit an article without menu item', () => {
     cy.doFrontendLogin();
-    cy.visit('index.php?option=com_content&view=form&layout=edit');
+    cy.visit('/index.php?option=com_content&view=form&layout=edit');
 
     cy.get('#jform_title').type('test article');
     cy.get('[data-submit-task="article.save"]').click();
diff --git a/tests/System/integration/site/components/com_content/Categories.cy.js b/tests/System/integration/site/components/com_content/Categories.cy.js
@@ -8,7 +8,7 @@ describe('Test in frontend that the content categories view', () => {
         await cy.db_createArticle({ title: 'automated test article 3', catid: id });
       })
       .then(() => {
-        cy.visit('index.php?option=com_content&view=categories');
+        cy.visit('/index.php?option=com_content&view=categories');
 
         cy.contains('automated test category 1');
         cy.get(':nth-child(1) > .com-content-categories__item-title-wrapper > .com-content-categories__item-title > .badge').contains('Article Count: 1');
diff --git a/tests/System/integration/site/components/com_content/Category.cy.js b/tests/System/integration/site/components/com_content/Category.cy.js
diff --git a/tests/System/integration/site/components/com_newsfeed/Category.cy.js b/tests/System/integration/site/components/com_newsfeed/Category.cy.js
diff --git a/tests/System/integration/site/components/com_newsfeed/NewsFeed.cy.js b/tests/System/integration/site/components/com_newsfeed/NewsFeed.cy.js
diff --git a/tests/System/support/commands/db.js b/tests/System/support/commands/db.js
