From 3458384732ad086775477a91f30c34e378f18a16 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Thu, 16 Jul 2015 19:26:19 +0200
Subject: [PATCH] End of day commit

---
 Gemfile                       |  5 +++--
 Gemfile.lock                  | 22 ++++------------------
 config/application.rb         |  2 +-
 config/environments/test.rb   |  2 +-
 config/initializers/emblem.rb |  9 +++++++++
 spec/spec_helper.rb           |  6 +++---
 6 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 config/initializers/emblem.rb

diff --git a/Gemfile b/Gemfile
index 7efb48d8..696c4a3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,8 +119,9 @@ end
 
 group :test do
   #gem 'capybara-webkit' #, '~>0.14.2' # version 1.1.0 does not yet compile in mavericks
-  gem 'selenium-webdriver', '~> 2.45.0.dev3'
-  gem 'poltergeist'
+  #gem 'selenium-webdriver', '~> 2.45.0.dev3'
+  #gem 'poltergeist'
+  gem 'capybara-webkit'
   gem 'capybara-screenshot'
   gem 'turnip'
   gem 'rspec-its'
diff --git a/Gemfile.lock b/Gemfile.lock
index b8e2aff5..813884e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,13 +134,13 @@ GEM
       capybara (>= 1.0, < 3)
       colored
       launchy
+    capybara-webkit (1.6.0)
+      capybara (>= 2.3.0, < 2.5.0)
+      json
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    childprocess (0.5.5)
-      ffi (~> 1.0, >= 1.0.11)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cliver (0.3.2)
     cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
@@ -227,7 +227,6 @@ GEM
     faye-websocket (0.9.2)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.9.6)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     foreman (0.77.0)
@@ -311,11 +310,6 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    poltergeist (1.6.0)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      multi_json (~> 1.0)
-      websocket-driver (>= 0.2.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -389,7 +383,6 @@ GEM
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
     ruby-progressbar (1.7.1)
-    rubyzip (1.1.7)
     safe_yaml (1.0.4)
     sass (3.4.13)
     sass-rails (5.0.1)
@@ -398,11 +391,6 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    selenium-webdriver (2.45.0)
-      childprocess (~> 0.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -464,7 +452,6 @@ GEM
     webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket (1.2.1)
     websocket-driver (0.5.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -488,6 +475,7 @@ DEPENDENCIES
   capistrano-rvm
   capistrano3-puma
   capybara-screenshot
+  capybara-webkit
   cmtool!
   coffee-rails
   couch_potato!
@@ -518,7 +506,6 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-instagram
   paperclip
-  poltergeist
   pry-rails
   puma
   quiet_assets
@@ -530,7 +517,6 @@ DEPENDENCIES
   rspec-its
   rspec-rails
   sass-rails (~> 5.0.0)
-  selenium-webdriver (~> 2.45.0.dev3)
   simplecov
   simply_stored!
   slim-rails
diff --git a/config/application.rb b/config/application.rb
index ad9602aa..c7b226d9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -103,7 +103,7 @@ module Qwaiter
     end
 
 
-    #config.handlebars.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates] if defined?(Ember::Rails) && defined?(Handlebars)
+    config.handlebars.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates] if defined?(Ember::Rails) && defined?(Handlebars)
 
     config.generators do |g|
       g.orm :simply_stored
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8fb7df32..73b23b0c 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -15,7 +15,7 @@ Qwaiter::Application.configure do
   # Configure static asset server for tests with Cache-Control for performance
   config.assets.compile = true
   config.assets.digest = false
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
   config.assets.compress = false
 
diff --git a/config/initializers/emblem.rb b/config/initializers/emblem.rb
new file mode 100644
index 00000000..43757ca2
--- /dev/null
+++ b/config/initializers/emblem.rb
@@ -0,0 +1,9 @@
+if "Ember::Emblem::Template".safe_constantize
+  Ember::Emblem::Template.configure do |config|
+    config.templates_root = ['app/templates']
+
+    config.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates]
+    # You can overwrite other config
+  end
+end
+
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 74e7d3d0..720bc1a0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,7 +10,7 @@ require 'turnip/capybara'
 require 'in_memory_q_counter'
 require 'capybara-screenshot/rspec'
 require 'webmock/rspec'
-require 'capybara/poltergeist'
+#require 'capybara/poltergeist'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -20,9 +20,9 @@ Dir.glob("spec/acceptance_steps/**/*steps.rb") { |f| load f, true }
 
 I18n.locale =I18n.default_locale
 Devise.stretches = 1
-#Capybara.javascript_driver = :webkit
+Capybara.javascript_driver = :webkit
 #Capybara.javascript_driver = :poltergeist
-Capybara.javascript_driver = :selenium
+#Capybara.javascript_driver = :selenium
 Capybara.default_wait_time = 3 # ember needs more time than the default of 2
 Capybara::Screenshot.webkit_options = { width: 1024, height: 768 }
 WebMock.disable_net_connect!(allow_localhost: true)