Fix default index

GSchutz · Nov 16, 2014 · 2e3d833 · 2e3d833
1 parent b3b7a0c
commit 2e3d833
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/src/index.js b/src/index.js
@@ -41,7 +41,7 @@ module.exports = function(object, filename) {
   if (fs.existsSync(process.cwd() + '/public')) {
     server.use(serveStatic(process.cwd() + '/public'));
   } else {
-    server.use(serveStatic(path.join(__dirname, './public')));
+    server.use(serveStatic(__dirname + '/public'));
   }
 
   server.use(cors({ origin: true, credentials: true }))
@@ -66,4 +66,4 @@ module.exports = function(object, filename) {
   }
 
   return server
-}
+}
diff --git a/public/favicon.ico → src/public/favicon.ico b/public/favicon.ico → src/public/favicon.ico
diff --git a/public/images/json.png → src/public/images/json.png b/public/images/json.png → src/public/images/json.png
diff --git a/public/index.html → src/public/index.html b/public/index.html → src/public/index.html
diff --git a/public/stylesheets/style.css → src/public/stylesheets/style.css b/public/stylesheets/style.css → src/public/stylesheets/style.css
diff --git a/test/index.js b/test/index.js
@@ -253,7 +253,7 @@ describe('Server', function() {
       it('should respond with html', function(done) {
         request(server)
           .get('/')
-          .expect('Content-Type', /html/)
+          .expect(/You're successfully running JSON Server/)
           .expect(200, done);
       });
     });