fix administrate users tests

hpi-schul-cloud · Apr 3, 2023 · ae917f4 · ae917f4
1 parent b38af07
commit ae917f4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/cypress/support/pages/admin/pageAdministration.js b/cypress/support/pages/admin/pageAdministration.js
@@ -137,10 +137,10 @@ class Management {
   clickOnAddButton (role) {
     if (!(role == 'student')) {
       cy.intercept('POST', '**/teachers').as('post_role_api')
-      cy.intercept('GET', '**/teachers?**').as('get_roles_api')
+      cy.intercept('GET', '**/teachers**').as('get_roles_api')
     } else {
       cy.intercept('POST', '**/students').as('post_role_api')
-      cy.intercept('GET', '**/students?**').as('get_roles_api')
+      cy.intercept('GET', '**/students**').as('get_roles_api')
     }
     cy.get(Management.#addButton)
       .click()

diff --git a/cypress/support/pages/news/pageNews.js b/cypress/support/pages/news/pageNews.js
@@ -31,40 +31,43 @@ class News {
   }
 
   confirmDeletionOnDialogBox () {
-    cy.get(News.#deleteNewsConfirmation, { timeout: 20000 })
+    cy.get(News.#deleteNewsConfirmation)
       .contains('Löschen')
         .should('exist')
-      .click().wait(3000)
+      .click()
   }
 
   clickOnDeleteNewsButton () {
-    cy.get(News.#deleteNews, { timeout: 20000 }).click().wait(3000)
+    cy.get(News.#deleteNews).click()
   }
 
   openNewsDetailPage (newsName) {
-    cy.get(News.#newsName, { timeout: 20000 })
+    cy.get(News.#newsName)
       .contains(newsName)
-      .click().wait(3000)
+        .should('exist')
+      .click()
   }
 
   seeCreatedNews (newsTitle, newsDesc) {
-    cy.get(News.#newsTitle, { timeout: 20000 })
+    cy.get(News.#newsTitle)
       .contains(newsTitle)
+        .should('exist')
     cy.get(News.#newsDescriptionVisible)
-      .contains(newsDesc, { timeout: 20000 })
+      .contains(newsDesc)
+        .should('exist')
   }
 
   clickOnCreateNewsSaveButton () {
-    cy.get(News.#newsCreateButton, { timeout: 20000 })
-      .click().wait(3000)
+    cy.get(News.#newsCreateButton)
+      .click()
   }
 
   seeTimeInput () {
-    cy.get(News.#newsTimeInput, { timeout: 20000 }).should('exist')
+    cy.get(News.#newsTimeInput).should('exist')
   }
 
   seeDateInput () {
-    cy.get(News.#newsDateInput, { timeout: 20000 }).should('exist')
+    cy.get(News.#newsDateInput).should('exist')
   }
 
   enterNewsDescription (newsDescription) {
@@ -84,20 +87,20 @@ class News {
   }
 
   clickOnAddNews () {
-    cy.get(News.#createNewNews, { timeout: 20000 })
+    cy.get(News.#createNewNews)
       .click()
   }
 
   navigateToNewsOverview () {
-    cy.get(News.#newsOverviewNavigationButton, { timeout: 20000 })
+    cy.get(News.#newsOverviewNavigationButton)
       .click()
     cy.url()
       .should('include', '/news')
   }
 
   teacherReadsNewsOnOverviewPage(titleOfNews, descriptionOfNews) {
-    cy.get(News.#pageTitle, { timeout: 20000 }).contains(titleOfNews).should('exist')
-    cy.get(News.#newsText, { timeout: 20000 }).contains(descriptionOfNews).should('exist')
+    cy.get(News.#pageTitle).contains(titleOfNews).should('exist')
+    cy.get(News.#newsText).contains(descriptionOfNews).should('exist')
   }
 }
 export default News