@saltcorn/server 0.7.4 → 0.8.0-beta.1

package/tests/files.test.js

@@ -39,22 +39,13 @@ describe("files admin", () => {
     await request(app)
       .get("/files")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Size (KiB)"));
+      .expect(toInclude("Upload file"));
   });
   it("download file", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getStaffLoginCookie();
     await request(app)
-      .get("/files/download/2")
-      .set("Cookie", loginCookie)
-      .expect(toSucceed());
-  });
-
-  it("serve file", async () => {
-    const app = await getApp({ disableCsrf: true });
-    const loginCookie = await getStaffLoginCookie();
-    await request(app)
-      .get("/files/serve/2")
+      .get("/files/download/rick.png")
       .set("Cookie", loginCookie)
       .expect(toSucceed());
   });
@@ -71,38 +62,38 @@ describe("files admin", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getStaffLoginCookie();
     await request(app)
-      .get("/files/serve/22")
+      .get("/files/serve/missingfile.foo")
       .set("Cookie", loginCookie)
       .expect(404);
   });
   it("not serve file to public", async () => {
     const app = await getApp({ disableCsrf: true });
-    await request(app).get("/files/serve/2").expect(toRedirect("/"));
+    await request(app).get("/files/serve/rick.png").expect(404);
   });
   it("not download file to public", async () => {
     const app = await getApp({ disableCsrf: true });
-    await request(app).get("/files/download/2").expect(toRedirect("/"));
+    await request(app).get("/files/download/rick.png").expect(404);
   });
   it("set file min role", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .post("/files/setrole/2")
+      .post("/files/setrole/rick.png")
       .set("Cookie", loginCookie)
       .send("role=10")
-      .expect(toRedirect("/files"));
+      .expect(toRedirect("/files?dir=."));
   });
   it("serve file to public after role change", async () => {
     const app = await getApp({ disableCsrf: true });
-    await request(app).get("/files/serve/2").expect(toSucceed());
+    await request(app).get("/files/serve/rick.png").expect(toSucceed());
   });
   it("delete file", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .post("/files/delete/2")
+      .post("/files/delete/rick.png")
       .set("Cookie", loginCookie)
-      .expect(toRedirect("/files"));
+      .expect(toRedirect("/files?dir=."));
   });
   it("upload file", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -112,7 +103,7 @@ describe("files admin", () => {
       .set("Cookie", loginCookie)
       .attach("file", Buffer.from("helloiamasmallfile", "utf-8"))
 
-      .expect(toRedirect("/files"));
+      .expect(toRedirect("/files?dir=."));
   });
 });
 describe("files edit", () => {

package/tests/tenant.test.js

@@ -1,3 +1,4 @@
+// File: tenant.test.js
 const db = require("@saltcorn/data/db");
 const request = require("supertest");
 
@@ -5,14 +6,16 @@ const getApp = require("../app");
 const {
   toRedirect,
   getAdminLoginCookie,
-  getStaffLoginCookie,
+  //getStaffLoginCookie,
   itShouldRedirectUnauthToLogin,
   toInclude,
-  toNotInclude,
+  //toNotInclude,
 } = require("../auth/testhelp");
 const { getState } = require("@saltcorn/data/db/state");
 
 afterAll(db.close);
+jest.setTimeout(10000);
+
 
 beforeAll(async () => {
   if (!db.isSQLite) {
@@ -38,6 +41,7 @@ describe("tenant routes", () => {
         .send("subdomain=test2")
         .expect(toInclude("Success"));
     });
+
     it("creates tenant with capital letter", async () => {
       db.enable_multi_tenant();
       await getState().setConfig("role_to_create_tenant", "10");
@@ -49,6 +53,7 @@ describe("tenant routes", () => {
         .expect(toInclude("Success"));
       db.set_sql_logging(false);
     });
+
     it("rejects existing tenant", async () => {
       db.enable_multi_tenant();
       await getState().setConfig("role_to_create_tenant", "10");
@@ -69,6 +74,7 @@ describe("tenant routes", () => {
         .set("Cookie", loginCookie)
         .expect(toInclude("peashoot"));
     });
+
     it("show tenant info", async () => {
       const loginCookie = await getAdminLoginCookie();
 
@@ -78,6 +84,7 @@ describe("tenant routes", () => {
         .set("Cookie", loginCookie)
         .expect(toInclude("E-mail"));
     });
+
     it("delete tenant", async () => {
       const loginCookie = await getAdminLoginCookie();
 
@@ -87,9 +94,12 @@ describe("tenant routes", () => {
         .set("Cookie", loginCookie)
         .expect(toRedirect("/tenant/list"));
     });
+
   } else {
+
     it("does not support tenants on SQLite", async () => {
       expect(db.isSQLite).toBe(true);
     });
+
   }
 });

package/tests/viewedit.test.js

@@ -43,6 +43,20 @@ describe("viewedit edit endpoint", () => {
       .set("Cookie", loginCookie)
       .expect(toInclude("author"));
   });
+  it("direct edit to config", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    const v = await View.findOne({ name: "authorlist" });
+    await request(app)
+      .post("/viewedit/save")
+      .send("viewtemplate=List")
+      .send("table_name=books")
+      .send("id=" + v.id)
+      .send("name=authorlist")
+      .send("min_role=10")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit/config/authorlist"));
+  });
   it("show list editor", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
@@ -478,6 +492,6 @@ describe("Library", () => {
       .get("/library/list")
       .set("Cookie", loginCookie)
       .expect(toInclude("Library"))
-      .expect(toNotInclude("ShinyCard"))
+      .expect(toNotInclude("ShinyCard"));
   });
 });