Revert the creation of a separate app setup

Author: hamishwillee

app.js

@@ -12,61 +12,55 @@ const catalogRouter = require("./routes/catalog"); // Import routes for "catalog
 const compression = require("compression");
 const helmet = require("helmet");
 
-// Create an Express application
-function createApp() {
-  const app = express();
+const app = express();
 
-  // Set up rate limiter: maximum of twenty requests per minute
-  const limiter = RateLimit({
-    windowMs: 1 * 40 * 1000, // 10 seconds
-    max: 40,
-  });
-  // Apply rate limiter to all requests
-  app.use(limiter);
+// Set up rate limiter: maximum of twenty requests per minute
+const limiter = RateLimit({
+  windowMs: 1 * 60 * 1000, // 10 seconds
+  max: 60,
+});
+// Apply rate limiter to all requests
+app.use(limiter);
 
-  // view engine setup
-  app.set("views", path.join(__dirname, "views"));
-  app.set("view engine", "pug");
+// view engine setup
+app.set("views", path.join(__dirname, "views"));
+app.set("view engine", "pug");
 
-  app.use(logger("dev"));
-  app.use(express.json());
-  app.use(express.urlencoded({ extended: false }));
-  app.use(cookieParser());
+app.use(logger("dev"));
+app.use(express.json());
+app.use(express.urlencoded({ extended: false }));
+app.use(cookieParser());
 
-  app.use(
-    helmet.contentSecurityPolicy({
-      directives: {
-        "script-src": ["'self'", "code.jquery.com", "cdn.jsdelivr.net"],
-      },
-    })
-  );
+app.use(
+  helmet.contentSecurityPolicy({
+    directives: {
+      "script-src": ["'self'", "code.jquery.com", "cdn.jsdelivr.net"],
+    },
+  })
+);
 
-  app.use(compression()); // Compress all routes
+app.use(compression()); // Compress all routes
 
-  app.use(express.static(path.join(__dirname, "public")));
+app.use(express.static(path.join(__dirname, "public")));
 
-  app.use("/", indexRouter);
-  app.use("/users", usersRouter);
-  app.use("/catalog", catalogRouter); // Add catalog routes to middleware chain.
+app.use("/", indexRouter);
+app.use("/users", usersRouter);
+app.use("/catalog", catalogRouter); // Add catalog routes to middleware chain.
 
-  // catch 404 and forward to error handler
-  app.use(function (req, res, next) {
-    next(createError(404));
-  });
+// catch 404 and forward to error handler
+app.use(function (req, res, next) {
+  next(createError(404));
+});
 
-  // error handler
-  app.use(function (err, req, res, next) {
-    // set locals, only providing error in development
-    res.locals.message = err.message;
-    res.locals.error = req.app.get("env") === "development" ? err : {};
+// error handler
+app.use(function (err, req, res, next) {
+  // set locals, only providing error in development
+  res.locals.message = err.message;
+  res.locals.error = req.app.get("env") === "development" ? err : {};
 
-    // render the error page
-    res.status(err.status || 500);
-    res.render("error");
-  });
+  // render the error page
+  res.status(err.status || 500);
+  res.render("error");
+});
 
-  return app;
-}
-
-//module.exports = app;
-module.exports = { createApp };
+module.exports = app;

bin/www

@@ -4,12 +4,10 @@
  * Module dependencies.
  */
 
+var app = require("../app");
 var debug = require("debug")("express-locallibrary-tutorial:server");
 var http = require("http");
 
-const { createApp } = require("../app");
-const app = createApp();
-
 /**
  * Get port from environment and store in Express.
  */

test/routes/author.test.js

@@ -3,9 +3,8 @@
 const request = require("supertest"); // For testing HTTP endpoints
 const { expect } = require("chai"); // For assertions (use 'expect' style)
 
-// Import the Express app and create it.
-const { createApp } = require("../../app");
-const app = createApp();
+// Import the Express app
+const app = require("../../app");
 
 // Set up test database
 const testDB = require("../utils/test_db");
@@ -34,9 +33,12 @@ describe("Author Routes", () => {
   describe("Author List Routes", () => {
     describe("GET /catalog/authors", () => {
       it("should return 200 and contain 'Author List' or similar text", async () => {
+        console.log("OK at this point?");
         const res = await request(app).get("/catalog/authors").expect(200);
+        console.log("2OK at this point?");
         // Adjust this check to your actual HTML output
         expect(res.text.toLowerCase()).to.include("author list");
+        console.log("3OK at this point?");
       });
     });
   });
@@ -126,7 +128,6 @@ describe("Author Routes", () => {
     });
   });
 
-  // Start of Author Create Route
   describe("Author Create Routes", () => {
     it("should load the author create form", async () => {
       const res = await request(app).get("/catalog/author/create").expect(200);
@@ -176,8 +177,6 @@ describe("Author Routes", () => {
     });
   });
 
-  // Author Update Routes
-
   describe("Author Update Routes", () => {
     let author;
 

test/routes/book.test.js

@@ -3,9 +3,8 @@
 const request = require("supertest"); // For testing HTTP endpoints
 const { expect } = require("chai"); // For assertions (use 'expect' style)
 
-// Import the Express app and create it.
-const { createApp } = require("../../app");
-const app = createApp();
+// Import the Express app
+const app = require("../../app");
 
 // Set up test database
 const testDB = require("../utils/test_db");

test/routes/bookinstance.test.js

@@ -3,9 +3,8 @@
 const request = require("supertest"); // For testing HTTP endpoints
 const { expect } = require("chai"); // For assertions (use 'expect' style)
 
-// Import the Express app and create it.
-const { createApp } = require("../../app");
-const app = createApp();
+// Import the Express app
+const app = require("../../app");
 
 // Set up test database
 const testDB = require("../utils/test_db");

test/routes/catalog.test.js

@@ -3,9 +3,8 @@
 const request = require("supertest"); // For testing HTTP endpoints
 const { expect } = require("chai"); // For assertions (use 'expect' style)
 
-// Import the Express app and create it.
-const { createApp } = require("../../app");
-const app = createApp();
+// Import the Express app
+const app = require("../../app");
 
 // Set up test database
 const testDB = require("../utils/test_db");

test/routes/genre.test.js

@@ -3,9 +3,8 @@
 const request = require("supertest"); // For testing HTTP endpoints
 const { expect } = require("chai"); // For assertions (use 'expect' style)
 
-// Import the Express app and create it.
-const { createApp } = require("../../app");
-const app = createApp();
+// Import the Express app
+const app = require("../../app");
 
 // Set up test database
 const testDB = require("../utils/test_db");

test/routes/index.test.js

@@ -3,9 +3,8 @@
 const request = require("supertest"); // For testing HTTP endpoints
 const { expect } = require("chai"); // For assertions (use 'expect' style)
 
-// Import the Express app and create it.
-const { createApp } = require("../../app");
-const app = createApp();
+// Import the Express app
+const app = require("../../app");
 
 describe("Index Routes", () => {
   // Block for the test suite for the root route '/'