Merge pull request #275 from brucek/update_deps

updating deps, also putting capybara screenshots somewhere sane

Author: justin808

Gemfile.lock

@@ -62,7 +62,7 @@ GEM
     bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
-    byebug (8.2.3)
+    byebug (8.2.4)
     capybara (2.7.0)
       addressable
       mime-types (>= 1.16)
@@ -73,7 +73,7 @@ GEM
     capybara-screenshot (1.0.12)
       capybara (>= 1.0, < 3)
       launchy
-    capybara-webkit (1.10.0)
+    capybara-webkit (1.10.1)
       capybara (>= 2.3.0, < 2.8.0)
       json
     childprocess (0.5.9)
@@ -104,10 +104,10 @@ GEM
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.6.0)
-    factory_girl (4.5.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.6.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
     ffi (1.9.10)
     foreman (0.78.0)
@@ -287,7 +287,7 @@ GEM
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    spring (1.6.4)
+    spring (1.7.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.6.0)

client/index.jade renamed to client/index.pug

@@ -42,9 +42,10 @@
     "autoprefixer": "^6.3.6",
     "axios": "^0.9.1",
     "babel": "^6.5.2",
-    "babel-cli": "^6.6.5",
-    "babel-core": "^6.7.4",
+    "babel-cli": "^6.7.5",
+    "babel-core": "^6.7.6",
     "babel-loader": "^6.2.4",
+    "babel-plugin-transform-es2015-modules-amd": "^6.6.5",
     "babel-polyfill": "^6.7.4",
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-react": "^6.5.0",
@@ -53,16 +54,16 @@
     "bootstrap-loader": "^1.0.10",
     "bootstrap-sass": "^3.3.6",
     "css-loader": "^0.23.1",
-    "es5-shim": "^4.5.7",
+    "es5-shim": "^4.5.8",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",
     "immutable": "^3.7.6",
     "imports-loader": "^0.6.5",
     "jquery": "^2.2.3",
     "jquery-ujs": "^1.2.1",
-    "loader-utils": "^0.2.13",
-    "lodash": "^4.8.2",
+    "loader-utils": "^0.2.14",
+    "lodash": "^4.11.0",
     "marked": "^0.3.5",
     "node-sass": "^3.4.2",
     "node-uuid": "^1.4.7",
@@ -71,11 +72,11 @@
     "react-addons-pure-render-mixin": "^0.14.8",
     "react-bootstrap": "^0.28.5",
     "react-dom": "^0.14.8",
-    "react-on-rails": "^5.1.1",
-    "react-redux": "^4.4.1",
-    "react-router": "^2.0.1",
-    "react-router-redux": "^4.0.1",
-    "redux": "^3.3.1",
+    "react-on-rails": "^5.2.0",
+    "react-redux": "^4.4.4",
+    "react-router": "^2.2.1",
+    "react-router-redux": "^4.0.2",
+    "redux": "^3.4.0",
     "redux-promise": "^0.5.3",
     "redux-thunk": "^2.0.1",
     "resolve-url-loader": "^1.4.3",
@@ -84,7 +85,7 @@
     "style-loader": "^0.13.1",
     "turbolinks": "^5.0.0-beta4",
     "url-loader": "^0.5.7",
-    "webpack": "^1.12.14"
+    "webpack": "^1.12.15"
   },
   "devDependencies": {
     "babel-plugin-react-transform": "^2.0.2",
@@ -96,9 +97,9 @@
     "eslint-plugin-react": "^4.3.0",
     "estraverse-fb": "^1.3.1",
     "express": "^4.13.4",
-    "jade": "^1.11.0",
+    "pug": "^2.0.0-alpha3",
     "jscs": "^2.11.0",
-    "jsdom": "^8.3.0",
+    "jsdom": "^8.3.1",
     "mocha": "^2.4.5",
     "react-addons-test-utils": "^0.14.8",
     "react-transform-hmr": "^1.0.4",

client/package.json

@@ -2,7 +2,7 @@
 var bodyParser = require('body-parser');
 var webpack = require('webpack');
 var WebpackDevServer = require('webpack-dev-server');
-var jade = require('jade');
+var pug = require('pug');
 var sleep = require('sleep');
 var config = require('./webpack.client.express.config');
 var uuid = require('node-uuid');
@@ -51,8 +51,8 @@ server.app.use('/', (req, res) => {
   var locals = {
     props: JSON.stringify(comments),
   };
-  var layout = `${process.cwd()}/index.jade`;
-  var html = jade.compileFile(layout, { pretty: true })(locals);
+  var layout = `${process.cwd()}/index.pug`;
+  var html = pug.compileFile(layout, { pretty: true })(locals);
   res.send(html);
 });
 

client/server-express.js

@@ -74,14 +74,15 @@
 
   Capybara.javascript_driver = driver
 
-  Capybara.server do |app, port|
+  Capybara.register_server(Capybara.javascript_driver) do |app, port|
     require "rack/handler/puma"
     Rack::Handler::Puma.run(app, Port: port)
   end
 
   # Capybara.default_max_wait_time = 15
   puts "Capybara using driver: #{Capybara.javascript_driver}"
 
+  Capybara.save_and_open_page_path = Rails.root.join(*%w( tmp capybara ))
   Capybara::Screenshot.prune_strategy = { keep: 10 }
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures