@raketa-cloud/admin 0.0.11 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/Adapter.js

@@ -125,6 +125,7 @@ export default class Adapter {
 
   async renderLayout(assigns, body) {
     const layoutTemplate = `${currentPath}/views/layouts/application.ejs`;
+
     return await ejs.renderFile(layoutTemplate, {
       ...assigns,
       body,

package/src/HonoAdapter.js

@@ -84,113 +84,117 @@ export default class HonoAdapter extends Adapter {
   ]) {
     const method = this.getMethod(verb);
 
-    [...Object.keys(this.globalConfig.i18n.locales), ""].forEach(
-      (currentLocale) => {
-        const completedPath = `/${currentLocale}${path}`;
-
-        method(completedPath, async (routerCtx, next) => {
-          const ctx = await this.createContext(
-            routerCtx,
-            next,
-            verb,
-            resource,
-            action
-          );
-
-          ctx.locales = this.globalConfig.i18n.locales;
-          ctx.defaultLocale = this.globalConfig.i18n.defaultLocale;
-          ctx.locale = currentLocale;
-
-          const _context = {
-            locales: ctx.locales,
-            locale: ctx.locale,
-            defaultLocale: ctx.defaultLocale,
-            path: ctx.req.path,
-            query: ctx.query || {},
-          };
-
-          console.info(
-            `\x1b[35m[${ctx.method}] ${ctx.rawPath}\x1b[0m -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`
-          );
-
-          const assigns = {
-            beforeFilterAssigns: {},
-            actionAssigns: {},
-            afterFilterAssigns: {},
-          };
-
-          // Initialize global context
-          ctx.initGlobalContext();
-
-          // Process before filters
-          if (before_filter) {
-            const {
-              redirect,
-              json,
-              assigns: beforeFilterAssigns = {},
-            } = before_filter(ctx) || {};
-
-            if (redirect) return routerCtx.redirect(redirect);
-
-            if (json) {
-              return routerCtx.json(json);
-            }
-
-            assigns.beforeFilterAssigns = beforeFilterAssigns;
-          }
-
-          // Process action
+    Object.keys(this.globalConfig.i18n.locales).forEach((currentLocale) => {
+      const completePath = `/${currentLocale}${path}`;
+
+      // A terrible, terrible hack...
+      // So how do we override for the entire handler.. do we need to completely override it, or just partially? Fun stuff?
+      this.router.router.routes = this.router.router.routes.filter((route) => {
+        return route[0] !== verb || route[1] !== completePath;
+      });
+
+      method(completePath, async (routerCtx, next) => {
+        const ctx = await this.createContext(
+          routerCtx,
+          next,
+          verb,
+          resource,
+          action
+        );
+
+        ctx.locales = this.globalConfig.i18n.locales;
+        ctx.defaultLocale = this.globalConfig.i18n.defaultLocale;
+        ctx.locale = currentLocale;
+
+        const _context = {
+          locales: ctx.locales,
+          locale: ctx.locale,
+          defaultLocale: ctx.defaultLocale,
+          path: ctx.req.path,
+          query: ctx.query || {},
+        };
+
+        console.info(
+          `\x1b[35m[${ctx.method}] ${ctx.rawPath}\x1b[0m -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`
+        );
+
+        const assigns = {
+          beforeFilterAssigns: {},
+          actionAssigns: {},
+          afterFilterAssigns: {},
+        };
+
+        // Initialize global context
+        ctx.initGlobalContext();
+
+        // Process before filters
+        if (before_filter) {
           const {
-            headers,
             redirect,
             json,
-            assigns: actionAssigns = {},
-          } = (await handler(ctx)) || {};
-          assigns.actionAssigns = actionAssigns;
-
-          this.applyHeaders(headers, routerCtx);
+            assigns: beforeFilterAssigns = {},
+          } = before_filter(ctx) || {};
 
           if (redirect) return routerCtx.redirect(redirect);
 
-          // Process after filters
-          if (after_filter) {
-            const {
-              redirect,
-              json,
-              assigns: afterFilterAssigns = {},
-            } = after_filter(ctx) || {};
+          if (json) {
+            return routerCtx.json(json);
+          }
 
-            if (redirect) return routerCtx.redirect(redirect);
+          assigns.beforeFilterAssigns = beforeFilterAssigns;
+        }
 
-            if (json) {
-              return routerCtx.json(json);
-            }
+        // Process action
+        const {
+          headers,
+          redirect,
+          json,
+          assigns: actionAssigns = {},
+        } = (await handler(ctx)) || {};
+        assigns.actionAssigns = actionAssigns;
 
-            assigns.afterFilterAssigns = afterFilterAssigns;
-          }
+        this.applyHeaders(headers, routerCtx);
+
+        if (redirect) return routerCtx.redirect(redirect);
+
+        // Process after filters
+        if (after_filter) {
+          const {
+            redirect,
+            json,
+            assigns: afterFilterAssigns = {},
+          } = after_filter(ctx) || {};
 
-          const fullAssigns = {
-            ...ctx.assigns,
-            ...assigns.beforeFilterAssigns,
-            ...assigns.actionAssigns,
-            ...assigns.afterFilterAssigns,
-            _context: _context,
-          };
+          if (redirect) return routerCtx.redirect(redirect);
 
           if (json) {
             return routerCtx.json(json);
           }
 
-          const rendered = this.renderAction({
-            views,
-            action,
-            assigns: fullAssigns,
-          });
-
-          return routerCtx.html(rendered);
+          assigns.afterFilterAssigns = afterFilterAssigns;
+        }
+
+        const fullAssigns = {
+          ...ctx.assigns,
+          ...assigns.beforeFilterAssigns,
+          ...assigns.actionAssigns,
+          ...assigns.afterFilterAssigns,
+          _context: _context,
+        };
+
+        if (json) {
+          return routerCtx.json(json);
+        }
+
+        const rendered = this.renderAction({
+          views,
+          action,
+          assigns: fullAssigns,
         });
-      }
-    );
+
+        return routerCtx.html(rendered);
+      });
+    });
   }
 
   routeCollection(mapping) {

package/src/index.js

@@ -10,29 +10,34 @@ export { default as setupCloud } from "./setupCloud";
 export { default as routeStandard } from "./routeStandard";
 
 export { default as Redirects } from "./cloud/Redirects";
-export { default as RedirectsHandler } from "./handlers/RedirectsHandler";
 export { default as Tags } from "./cloud/Tags";
-export { default as TagsHandler } from "./handlers/TagsHandler";
 export { default as Settings } from "./cloud/Settings";
-export { default as SettingsGeneralHandler } from "./handlers/SettingsGeneralHandler";
-export { default as SettingsLayoutHandler } from "./handlers/SettingsLayoutHandler";
-export { default as SettingsMetaHandler } from "./handlers/SettingsMetaHandler";
 export { default as PageChanges } from "./cloud/PageChanges";
 export { default as PageRevisions } from "./cloud/PageRevisions";
 export { default as Pages } from "./cloud/Pages";
-export { default as PageCloneHandler } from "./handlers/PageCloneHandler";
-export { default as PageDeleteHandler } from "./handlers/PageDeleteHandler";
-export { default as PageRevisionsCodesHandler } from "./handlers/PageRevisionsCodesHandler";
-export { default as PageRevisionsGeneralHandler } from "./handlers/PageRevisionsGeneralHandler";
-export { default as PageRevisionsHandler } from "./handlers/PageRevisionsHandler";
-export { default as PageRevisionsLockHandler } from "./handlers/PageRevisionsLockHandler";
-export { default as PageRevisionsMetaHandler } from "./handlers/PageRevisionsMetaHandler";
-export { default as PageRevisionsTagsHandler } from "./handlers/PageRevisionsTagsHandler";
-export { default as PageRevisionsUnlockHandler } from "./handlers/PageRevisionsUnlockHandler";
-export { default as PageRevisionsVisualsHandler } from "./handlers/PageRevisionsVisualsHandler";
-export { default as PageRevisionsWidgetsHandler } from "./handlers/PageRevisionsWidgetsHandler";
-export { default as PageTranslationsHandler } from "./handlers/PageTranslationsHandler";
-export { default as PageURLsHandler } from "./handlers/PageURLsHandler";
-export { default as PagesHandler } from "./handlers/PagesHandler";
-export { default as PublishPageRevisionHandler } from "./handlers/PublishPageRevisionHandler";
-export { default as RevertPageRevisionHandler } from "./handlers/RevertPageRevisionHandler";
+
+export { default as PageRevisionsHandler } from "./handlers/page_revisions/PageRevisionsHandler";
+export { default as PageRevisionsCodeHandler } from "./handlers/page_revisions/CodeHandler";
+export { default as PageRevisionsGeneralHandler } from "./handlers/page_revisions/GeneralHandler";
+export { default as PageRevisionsMetaHandler } from "./handlers/page_revisions/MetaHandler";
+export { default as PageRevisionsLocksHandler } from "./handlers/page_revisions/LocksHandler";
+export { default as PageRevisionsUnlocksHandler } from "./handlers/page_revisions/UnlocksHandler";
+export { default as PageRevisionsVisualHandler } from "./handlers/page_revisions/VisualHandler";
+export { default as PageRevisionsTagHandler } from "./handlers/page_revisions/TagHandler";
+export { default as PageRevisionsWidgetHandler } from "./handlers/page_revisions/WidgetHandler";
+export { default as PageRevisionsPublishesHandler } from "./handlers/page_revisions/PublishesHandler";
+export { default as PageRevisionsRevertsHandler } from "./handlers/page_revisions/RevertsHandler";
+
+export { default as RedirectsHandler } from "./handlers/RedirectsHandler";
+
+export { default as TagsHandler } from "./handlers/TagsHandler";
+
+export { default as PageClonesHandler } from "./handlers/pages/ClonesHandler";
+export { default as PageDeletesHandler } from "./handlers/pages/DeletesHandler";
+export { default as PageTranslationsHandler } from "./handlers/pages/TranslationsHandler";
+export { default as PageURLsHandler } from "./handlers/pages/URLsHandler";
+export { default as PagesHandler } from "./handlers/pages/PagesHandler";
+
+export { default as SettingsGeneralHandler } from "./handlers/settings/GeneralHandler";
+export { default as SettingsLayoutHandler } from "./handlers/settings/LayoutHandler";
+export { default as SettingsMetaHandler } from "./handlers/settings/MetaHandler";

package/src/routePages.js

@@ -1,100 +1,55 @@
 import routeCollection from "./routeCollection";
 import routeNestedCollection from "./routeNestedCollection";
 import routeNestedMember from "./routeNestedMember";
-import PageTranslationsHandler from "./handlers/PageTranslationsHandler";
-import PageRevisionsHandler from "./handlers/PageRevisionsHandler";
-import PageRevisionsGeneralHandler from "./handlers/PageRevisionsGeneralHandler";
-import PageRevisionsVisualsHandler from "./handlers/PageRevisionsVisualsHandler";
-import PageRevisionsCodesHandler from "./handlers/PageRevisionsCodesHandler";
-import PageRevisionsMetaHandler from "./handlers/PageRevisionsMetaHandler";
-import PageRevisionsTagsHandler from "./handlers/PageRevisionsTagsHandler";
-import PageRevisionsLockHandler from "./handlers/PageRevisionsLockHandler";
-import PageRevisionsUnlockHandler from "./handlers/PageRevisionsUnlockHandler";
-import PageCloneHandler from "./handlers/PageCloneHandler";
-import PageURLsHandler from "./handlers/PageURLsHandler";
-import PageDeleteHandler from "./handlers/PageDeleteHandler";
-import RevertPageRevisionHandler from "./handlers/RevertPageRevisionHandler";
-import PublishPageRevisionHandler from "./handlers/PublishPageRevisionHandler";
-import PageRevisionsWidgetsHandler from "./handlers/PageRevisionsWidgetsHandler";
-import PagesHandler from "./handlers/PagesHandler";
+import TranslationsHandler from "./handlers/pages/TranslationsHandler";
+import PageRevisionsHandler from "./handlers/page_revisions/PageRevisionsHandler";
+import GeneralHandler from "./handlers/page_revisions/GeneralHandler";
+import VisualHandler from "./handlers/page_revisions/VisualHandler";
+import CodeHandler from "./handlers/page_revisions/CodeHandler";
+import MetaHandler from "./handlers/page_revisions/MetaHandler";
+import TagHandler from "./handlers/page_revisions/TagHandler";
+import LocksHandler from "./handlers/page_revisions/LocksHandler";
+import UnlocksHandler from "./handlers/page_revisions/UnlocksHandler";
+import ClonesHandler from "./handlers/pages/ClonesHandler";
+import URLsHandler from "./handlers/pages/URLsHandler";
+import DeletesHandler from "./handlers/pages/DeletesHandler";
+import RevertsHandler from "./handlers/page_revisions/RevertsHandler";
+import PublishesHandler from "./handlers/page_revisions/PublishesHandler";
+import WidgetHandler from "./handlers/page_revisions/WidgetHandler";
+import PagesHandler from "./handlers/pages/PagesHandler";
 
 function routePages(adapter) {
   routeCollection(adapter, "pages", PagesHandler);
-  routeNestedCollection(
-    adapter,
-    "pages",
-    "translations",
-    PageTranslationsHandler
-  );
+  routeNestedCollection(adapter, "pages", "translations", TranslationsHandler);
   routeNestedCollection(
     adapter,
     "pages",
     "page_revisions",
     PageRevisionsHandler
   );
-  routeNestedMember(
-    adapter,
-    "page_revisions",
-    "general",
-    PageRevisionsGeneralHandler
-  );
-  routeNestedMember(
-    adapter,
-    "page_revisions",
-    "visuals",
-    PageRevisionsVisualsHandler
-  );
-  routeNestedMember(
-    adapter,
-    "page_revisions",
-    "codes",
-    PageRevisionsCodesHandler
-  );
-  routeNestedMember(
-    adapter,
-    "page_revisions",
-    "meta",
-    PageRevisionsMetaHandler
-  );
-  routeNestedMember(
-    adapter,
-    "page_revisions",
-    "tags",
-    PageRevisionsTagsHandler
-  );
-  routeNestedCollection(
-    adapter,
-    "page_revisions",
-    "locks",
-    PageRevisionsLockHandler
-  );
-  routeNestedCollection(
-    adapter,
-    "page_revisions",
-    "unlocks",
-    PageRevisionsUnlockHandler
-  );
-  routeNestedCollection(adapter, "pages", "clones", PageCloneHandler);
-  routeNestedCollection(adapter, "pages", "urls", PageURLsHandler);
-  routeNestedCollection(adapter, "pages", "deletes", PageDeleteHandler);
+  routeNestedMember(adapter, "page_revisions", "general", GeneralHandler);
+  routeNestedMember(adapter, "page_revisions", "visuals", VisualHandler);
+  routeNestedMember(adapter, "page_revisions", "codes", CodeHandler);
+  routeNestedMember(adapter, "page_revisions", "meta", MetaHandler);
+  routeNestedMember(adapter, "page_revisions", "tags", TagHandler);
+  routeNestedCollection(adapter, "page_revisions", "locks", LocksHandler);
+  routeNestedCollection(adapter, "page_revisions", "unlocks", UnlocksHandler);
+  routeNestedCollection(adapter, "pages", "clones", ClonesHandler);
+  routeNestedCollection(adapter, "pages", "urls", URLsHandler);
+  routeNestedCollection(adapter, "pages", "deletes", DeletesHandler);
   routeNestedCollection(
     adapter,
     "pages",
     "page_changes/reverts",
-    RevertPageRevisionHandler
+    RevertsHandler
   );
   routeNestedCollection(
     adapter,
     "page_revisions",
     "publishes",
-    PublishPageRevisionHandler
-  );
-  routeNestedMember(
-    adapter,
-    "api/page_revisions",
-    "widgets",
-    PageRevisionsWidgetsHandler
+    PublishesHandler
   );
+  routeNestedMember(adapter, "api/page_revisions", "widgets", WidgetHandler);
 }
 
 export default routePages;

package/src/routeSettings.js

@@ -1,12 +1,12 @@
 import routeMember from "./routeMember";
-import SettingsLayoutHandler from "./handlers/SettingsLayoutHandler";
-import SettingsMetaHandler from "./handlers/SettingsMetaHandler";
-import SettingsGeneralHandler from "./handlers/SettingsGeneralHandler";
+import LayoutHandler from "./handlers/settings/LayoutHandler";
+import MetaHandler from "./handlers/settings/MetaHandler";
+import GeneralHandler from "./handlers/settings/GeneralHandler";
 
 function routeSettings(adapter) {
-  routeMember(adapter, "settings/general", SettingsGeneralHandler);
-  routeMember(adapter, "settings/meta", SettingsMetaHandler);
-  routeMember(adapter, "settings/layout", SettingsLayoutHandler);
+  routeMember(adapter, "settings/general", GeneralHandler);
+  routeMember(adapter, "settings/meta", MetaHandler);
+  routeMember(adapter, "settings/layout", LayoutHandler);
 }
 
 export default routeSettings;

package/src/{handlers → tests/handlers}/RedirectsHandler.test/create.test.js

@@ -1,8 +1,8 @@
-import RedirectsHandler from "../RedirectsHandler";
-import Redirects from "../../cloud/Redirects";
+import RedirectsHandler from "../../../handlers/RedirectsHandler";
+import Redirects from "../../../cloud/Redirects";
 
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import { testConfig } from "../../../../test/handlersHelper";
+import Factory from "../../../../test/factory";
 
 function buildCtx(redirect) {
   return {

package/src/{handlers → tests/handlers}/RedirectsHandler.test/create_form.test.js

@@ -1,7 +1,7 @@
-import RedirectsHandler from "../RedirectsHandler";
-import Redirects from "../../cloud/Redirects";
+import RedirectsHandler from "../../../handlers/RedirectsHandler";
+import Redirects from "../../../cloud/Redirects";
 
-import { testConfig } from "../../../test/handlersHelper";
+import { testConfig } from "../../../../test/handlersHelper";
 
 function buildCtx() {
   return {

package/src/{handlers → tests/handlers}/RedirectsHandler.test/destroy.test.js

@@ -1,8 +1,8 @@
-import RedirectsHandler from "../RedirectsHandler";
-import Redirects from "../../cloud/Redirects";
+import RedirectsHandler from "../../../handlers/RedirectsHandler";
+import Redirects from "../../../cloud/Redirects";
 
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import { testConfig } from "../../../../test/handlersHelper";
+import Factory from "../../../../test/factory";
 
 function buildCtx() {
   return {

package/src/{handlers → tests/handlers}/RedirectsHandler.test/edit_form.test.js

@@ -1,8 +1,8 @@
-import RedirectsHandler from "../RedirectsHandler";
-import Redirects from "../../cloud/Redirects";
+import RedirectsHandler from "../../../handlers/RedirectsHandler";
+import Redirects from "../../../cloud/Redirects";
 
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import { testConfig } from "../../../../test/handlersHelper";
+import Factory from "../../../../test/factory";
 
 function buildCtx() {
   return {

package/src/{handlers → tests/handlers}/RedirectsHandler.test/index.test.js

@@ -1,8 +1,8 @@
-import RedirectsHandler from "./../RedirectsHandler";
-import Redirects from "../../cloud/Redirects";
+import RedirectsHandler from "../../../handlers/RedirectsHandler";
+import Redirects from "../../../cloud/Redirects";
 
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import { testConfig } from "../../../../test/handlersHelper";
+import Factory from "../../../../test/factory";
 
 describe("Redirects", () => {
   function buildCtx() {

package/src/{handlers → tests/handlers}/RedirectsHandler.test/show.test.js

@@ -1,7 +1,7 @@
-import RedirectsHandler from "../RedirectsHandler";
-import Redirects from "../../cloud/Redirects";
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import RedirectsHandler from "../../../handlers/RedirectsHandler";
+import Redirects from "../../../cloud/Redirects";
+import { testConfig } from "../../../../test/handlersHelper";
+import Factory from "../../../../test/factory";
 
 function buildCtx() {
   return {

package/src/{handlers → tests/handlers}/RedirectsHandler.test/update.test.js

@@ -1,8 +1,8 @@
-import RedirectsHandler from "../RedirectsHandler";
-import Redirects from "../../cloud/Redirects";
+import RedirectsHandler from "../../../handlers/RedirectsHandler";
+import Redirects from "../../../cloud/Redirects";
 
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import { testConfig } from "../../../../test/handlersHelper";
+import Factory from "../../../../test/factory";
 
 function buildCtx(redirect) {
   return {

package/src/{handlers/PageRevisionsCodesHandler.test → tests/handlers/page_revisions/CodesHandler.test}/edit_form.test.js

@@ -1,7 +1,7 @@
-import PageRevisionsCodesHandler from "../PageRevisionsCodesHandler";
-import PageRevisions from "../../cloud/PageRevisions";
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import CodeHandler from "../../../../handlers/page_revisions/CodeHandler";
+import PageRevisions from "../../../../cloud/PageRevisions";
+import { testConfig } from "../../../../../test/handlersHelper";
+import Factory from "../../../../../test/factory";
 
 function buildCtx(revision) {
   return {
@@ -22,7 +22,7 @@ describe("Page revision code settings", () => {
       .spyOn(ctx.client.pageRevisions, "find")
       .mockImplementation(() => revision);
 
-    const result = await PageRevisionsCodesHandler.edit_form(ctx);
+    const result = await CodeHandler.edit_form(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
 
@@ -48,7 +48,7 @@ describe("Page revision code settings", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await PageRevisionsCodesHandler.edit_form(ctx);
+      await CodeHandler.edit_form(ctx);
     }).rejects.toThrow("Missing revision #42");
 
     expect(mockFind).toHaveBeenCalledWith("42", "en");

package/src/{handlers/PageRevisionsCodesHandler.test → tests/handlers/page_revisions/CodesHandler.test}/update.test.js

@@ -1,7 +1,7 @@
-import PageRevisionsCodesHandler from "../PageRevisionsCodesHandler";
-import PageRevisions from "../../cloud/PageRevisions";
-import { testConfig } from "../../../../../apps/admin/test/handlersHelper";
-import Factory from "../../../../../apps/admin/test/factory";
+import CodeHandler from "../../../../handlers/page_revisions/CodeHandler";
+import PageRevisions from "../../../../cloud/PageRevisions";
+import { testConfig } from "../../../../../test/handlersHelper";
+import Factory from "../../../../../test/factory";
 
 function buildCtx(revision, updateSettings) {
   return {
@@ -38,7 +38,7 @@ describe("Page revision code settings", () => {
         errors: null,
       }));
 
-    const result = await PageRevisionsCodesHandler.update(ctx);
+    const result = await CodeHandler.update(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
     expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
@@ -83,7 +83,7 @@ describe("Page revision code settings", () => {
         errors: [{ key: "generalError", message: "some error" }],
       }));
 
-    const result = await PageRevisionsCodesHandler.update(ctx);
+    const result = await CodeHandler.update(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
     expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
@@ -129,7 +129,7 @@ describe("Page revision code settings", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await PageRevisionsCodesHandler.update(ctx);
+      await CodeHandler.update(ctx);
     }).rejects.toThrow(`Missing revision #${revision.id}`);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");

package/src/{handlers/PageRevisionsGeneralHandler.test → tests/handlers/page_revisions/GeneralHandler.test}/edit_form.test.js

@@ -1,8 +1,8 @@
-import PageRevisionsGeneralHandler from "../PageRevisionsGeneralHandler";
-import PageRevisions from "../../cloud/PageRevisions";
-import Pages from "../../cloud/Pages";
-import { testConfig } from "../../../test/handlersHelper";
-import Factory from "../../../test/factory";
+import GeneralHandler from "../../../../handlers/page_revisions/GeneralHandler";
+import PageRevisions from "../../../../cloud/PageRevisions";
+import Pages from "../../../../cloud/Pages";
+import { testConfig } from "../../../../../test/handlersHelper";
+import Factory from "../../../../../test/factory";
 
 function buildCtx(revision) {
   return {
@@ -24,7 +24,7 @@ describe("Page revision genereal settings", () => {
       .spyOn(ctx.client.pageRevisions, "find")
       .mockImplementation(() => revision);
 
-    const result = await PageRevisionsGeneralHandler.edit_form(ctx);
+    const result = await GeneralHandler.edit_form(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
 
@@ -54,7 +54,7 @@ describe("Page revision genereal settings", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await PageRevisionsGeneralHandler.edit_form(ctx);
+      await GeneralHandler.edit_form(ctx);
     }).rejects.toThrow("Missing revision #42");
 
     expect(mockFind).toHaveBeenCalledWith("42", "en");