Merge pull request learn-co-students#14 from learn-co-curriculum/update-tests

pletcher · web-flow · commit 2de999997aef · 2016-07-26T14:58:19.000-04:00
fixed tests to conform to new browser pattern
diff --git a/index.html b/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Mocha</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="node_modules/mocha/mocha.css" />
+  </head>
+  <body>
+    <main id="main">
+    </main>
+    <script src="index.js"></script>
+    <!-- Open this file and call `mocha.run()` in console to run tests -->
+    <div id="mocha"></div>
+    <script src="node_modules/mocha/mocha.js"></script>
+    <script src="node_modules/expect/umd/expect.min.js"></script>
+    <script src="node_modules/sinon/pkg/sinon.js"></script>
+    <script>mocha.setup('bdd');</script>
+    <script src="index.js"></script>
+    <script src="test/index-test.js"></script>
+
+  </body>
+</html>
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -22,8 +22,9 @@
   },
   "homepage": "https://github.com/learn-co-curriculum/javascript-strings-lab#readme",
   "devDependencies": {
+    "expect": "^1.20.2",
     "jsdom": "^8.5.0",
-    "mocha": "^2.4.5",
+    "mocha": "^2.5.3",
     "mocha-jsdom": "^1.1.0",
     "mocha-multi": "^0.9.0"
   }
diff --git a/test/index-test.js b/test/index-test.js
@@ -0,0 +1,13 @@
+/*global concatenatedString, describe, interpolatedString, it, myString */
+
+it('defines `greeting`', function() {
+  assert.equal(greeting, "Hello, everybody!")
+})
+
+it('concatenates strings to greet a special guest in `greetSpecialGuest`', function() {
+  assert.equal(greetSpecialGuest, "Hello, " + specialGuest + "!")
+})
+
+it('interpolates a string in `conversation`', function() {
+  assert.equal(conversation, `Let's talk about ${topic}.`)
+})
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -0,0 +1 @@
+--timeout 10000
diff --git a/test/root.js b/test/root.js
@@ -0,0 +1,26 @@
+global.expect = require('expect');
+
+const babel = require('babel-core');
+const jsdom = require('jsdom');
+const path = require('path');
+
+
+before(function(done) {
+  const babelResult = babel.transformFileSync(path.resolve(__dirname, '..', 'index.js'), {
+    presets: ['es2015']
+  });
+
+  //const src = path.resolve(__dirname, '..', 'index.js');
+
+  jsdom.env('<div></div>', [], {src: babelResult.code}, (err, window) => {
+    if (err) {
+      return done(err);
+    }
+
+    Object.keys(window).forEach(key => {
+      global[key] = window[key];
+    });
+
+    return done();
+  });
+}); 
diff --git a/test/strings-test.js b/test/strings-test.js
