Merge branch 'develop' into feature/969-added-helptext

CHANGELOG.md

@@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file.
 - [#236](https://github.com/os2display/display-admin-client/pull/236)
   - Add help text to activation code form.
   - Fixed warnings raised when compiling.
+- [#234](https://github.com/os2display/display-admin-client/pull/234)
+  - Cleaned up code flow in playlist saving.
+  - Changed to chaining relations puts.
 - [#235](https://github.com/os2display/display-admin-client/pull/235)
   - Added roles to users list.
 - [#233](https://github.com/os2display/display-admin-client/pull/233)

src/components/playlist/campaign.spec.js

@@ -76,26 +76,6 @@ describe("Campaign pages work", () => {
     cy.get("#slides-section").find("tbody").should("not.exist");
   });
 
-  it("It displays success toast on save", () => {
-    // Mock successful response on post
-    cy.intercept("PUT", "**/playlists/*", {
-      statusCode: 201,
-      fixture: "playlists/playlist-successful.json",
-    });
-
-    // Mock successful response on get
-    cy.intercept("GET", "**/playlists/*", {
-      fixture: "playlists/playlist-successful.json",
-    });
-
-    cy.visit("/campaign/edit/123");
-
-    // Displays success toast and redirects
-    cy.get(".Toastify").find(".Toastify__toast--success").should("not.exist");
-    cy.get("#save_playlist").click();
-    cy.get(".Toastify").find(".Toastify__toast--success").contains("gemt");
-  });
-
   it("It display error toast on save error", () => {
     // Mock error response on post
     cy.intercept("PUT", "**/playlists/*", {