From 168f21654c012ee102a4e8b81ddef1cb199b5bcc Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 26 Jun 2014 15:15:24 -0700
Subject: [PATCH] Rename serveStaticFiles to staticFilesMiddleware

---
 packages/webapp/webapp_server.js | 4 ++--
 packages/webapp/webapp_tests.js  | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 0152f6d33d..93a29cd7e5 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -264,7 +264,7 @@ var getBoilerplate = function (request) {
 //   - staticFiles: object mapping pathname of file in manifest -> {
 //     path, cacheable, sourceMapUrl, type }
 //   - clientDir: root directory for static files from client manifest
-WebAppInternals.serveStaticFiles = function (options, req, res, next) {
+WebAppInternals.staticFilesMiddleware = function (options, req, res, next) {
   if ('GET' != req.method && 'HEAD' != req.method) {
     next();
     return;
@@ -461,7 +461,7 @@ var runWebAppServer = function () {
   // Serve static files from the manifest.
   // This is inspired by the 'static' middleware.
   app.use(function (req, res, next) {
-    return WebAppInternals.serveStaticFiles({
+    return WebAppInternals.staticFilesMiddleware({
       staticFiles: staticFiles,
       clientDir: clientDir
     }, req, res, next);
diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index 62b2c75749..d300e863cd 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -95,9 +95,10 @@ Tinytest.add("webapp - additional static javascript", function (test) {
     req.method = "GET";
     req.url = "/" + additionalScriptPathname;
     var nextCalled = false;
-    WebAppInternals.serveStaticFiles(staticFilesOpts, req, res, function () {
-      nextCalled = true;
-    });
+    WebAppInternals.staticFilesMiddleware(
+      staticFilesOpts, req, res, function () {
+        nextCalled = true;
+      });
     test.isTrue(nextCalled);
 
     // When inline scripts are disallowed, the script body should not be
@@ -116,7 +117,7 @@ Tinytest.add("webapp - additional static javascript", function (test) {
 
     // And the static file handler should serve the script at that pathname.
     res = new MockResponse();
-    WebAppInternals.serveStaticFiles(staticFilesOpts, req, res,
+    WebAppInternals.staticFilesMiddleware(staticFilesOpts, req, res,
                                      function () { });
     var resBody = res.getBody();
     test.isTrue(resBody.indexOf(additionalScript) !== -1);