Upgrades and simple_form dependency removal

.gitignore

@@ -35,3 +35,4 @@ public/capybara.html
 chromedriver.log
 /coverage
 /old_cap
+gem_graph.png

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.0.beta4'
+gem 'rails', '4.2.0.rc2'
 gem 'rack-cors', :require => 'rack/cors'
 
 # Bundle edge Rails instead:
@@ -17,7 +17,7 @@ gem 'active_model_serializers' # explicitly outside assets
 group :assets do
   gem 'jquery-rails'
   gem 'jquery-ui-rails'
-  gem 'ember-source' #, github: 'emberjs/ember.js', require: 'ember/source'
+  gem 'ember-source', '1.8.1'#, github: 'emberjs/ember.js', require: 'ember/source'
   gem 'ember-rails'
   gem 'ember_script-rails', github: 'ghempton/ember-script-rails'
   gem 'sass-rails', '5.0.0.beta1'
@@ -54,7 +54,7 @@ gem 'simply_stored', github: 'bterkuile/simply_stored'
 gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2' #, '3.1.0' #, '2.0.4'
 gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
 gem "omniauth-facebook"
-gem 'simple_form'
+#gem 'simple_form'
 gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
 #gem 'cmtool', github: 'bterkuile/cmtool'
 gem 'paperclip' #, '3.5.2' # cmtool
@@ -93,7 +93,7 @@ group :development do
   gem 'capistrano-rails', '~> 1.1', require: false
   gem 'spring'
   gem 'spring-commands-rspec'
-  gem 'web-console', '~> 2.0.0.beta3'
+  gem 'web-console', '~> 2.0.0'
 
 end
 
@@ -103,6 +103,7 @@ group :test do
   # gem 'capybara' #, '2.0.3'
   #gem 'selenium-webdriver'
   gem 'capybara-webkit' #, '~>0.14.2' # version 1.1.0 does not yet compile in mavericks
+  gem 'capybara-screenshot'
   gem 'turnip'
   gem 'rspec-its'
   gem 'launchy'
@@ -114,7 +115,7 @@ end
 
 # Use unicorn as the app server
 # gem 'unicorn'
-gem 'foreman'
+# gem 'foreman'
 
 # Deploy with Capistrano
 # gem 'capistrano'

Gemfile.lock

@@ -1,12 +1,12 @@
 GIT
   remote: git://github.com/bterkuile/cmtool.git
-  revision: b5a24fd34697160e80394e74fdb1ea15c8f1f864
+  revision: a4bef656ccf3ad434f13e458e2c96abe8636cfa0
   specs:
     cmtool (1.0.0)
       bourbon
       email_validator
-      haml-rails
       jquery-rails
+      paperclip
       slim-rails
       tinymce-rails
 
@@ -59,46 +59,46 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.beta4)
+    actionmailer (4.2.0.rc2)
-      actionpack (= 4.2.0.beta4)
+      actionpack (= 4.2.0.rc2)
-      actionview (= 4.2.0.beta4)
+      actionview (= 4.2.0.rc2)
-      activejob (= 4.2.0.beta4)
+      activejob (= 4.2.0.rc2)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0.beta4)
+    actionpack (4.2.0.rc2)
-      actionview (= 4.2.0.beta4)
+      actionview (= 4.2.0.rc2)
-      activesupport (= 4.2.0.beta4)
+      activesupport (= 4.2.0.rc2)
-      rack (~> 1.6.0.beta)
+      rack (~> 1.6.0.beta2)
       rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta4)
+    actionview (4.2.0.rc2)
-      activesupport (= 4.2.0.beta4)
+      activesupport (= 4.2.0.rc2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
     active_decorator (0.3.4)
-    active_model_serializers (0.9.0)
+    active_model_serializers (0.9.1)
       activemodel (>= 3.2)
-    activejob (4.2.0.beta4)
+    activejob (4.2.0.rc2)
-      activesupport (= 4.2.0.beta4)
+      activesupport (= 4.2.0.rc2)
       globalid (>= 0.3.0)
-    activemodel (4.2.0.beta4)
+    activemodel (4.2.0.rc2)
-      activesupport (= 4.2.0.beta4)
+      activesupport (= 4.2.0.rc2)
       builder (~> 3.1)
-    activerecord (4.2.0.beta4)
+    activerecord (4.2.0.rc2)
-      activemodel (= 4.2.0.beta4)
+      activemodel (= 4.2.0.rc2)
-      activesupport (= 4.2.0.beta4)
+      activesupport (= 4.2.0.rc2)
-      arel (>= 6.0.0.beta2, < 6.1)
+      arel (~> 6.0)
-    activesupport (4.2.0.beta4)
+    activesupport (4.2.0.rc2)
       i18n (>= 0.7.0.beta1, < 0.8)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     addressable (2.3.6)
-    arel (6.0.0.beta2)
+    arel (6.0.0)
     barber (0.5.0)
       ember-source
       execjs
@@ -107,7 +107,7 @@ GEM
       barber (>= 0.4.1)
       emblem-source
     bcrypt (3.1.9)
-    binding_of_caller (0.7.3.pre1)
+    binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
@@ -115,7 +115,8 @@ GEM
       sass (~> 3.3)
       thor
     builder (3.2.2)
-    capistrano (3.2.1)
+    capistrano (3.3.4)
+      capistrano-stats (~> 1.1.0)
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
@@ -128,18 +129,23 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
+    capistrano-stats (1.1.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    capybara-screenshot (1.0.3)
+      capybara (>= 1.0, < 3)
+      colored
+      launchy
     capybara-webkit (1.3.1)
       capybara (>= 2.0.2, < 2.5.0)
       json
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.4)
+    cocaine (0.5.5)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
     coffee-rails (4.1.0)
@@ -149,7 +155,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    colorize (0.7.3)
+    colored (1.2)
+    colorize (0.7.4)
     cookiejar (0.3.2)
     couchrest (1.2.0)
       mime-types (~> 1.15)
@@ -158,9 +165,6 @@ GEM
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
     em-http-request (1.1.2)
       addressable (>= 2.3.4)
       cookiejar
@@ -169,9 +173,9 @@ GEM
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.0)
       eventmachine (>= 1.0.0.beta.4)
-    email_validator (1.4.0)
+    email_validator (1.5.0)
       activemodel
-    ember-data-source (1.0.0.beta.11)
+    ember-data-source (1.0.0.beta.12)
       ember-source
     ember-rails (0.15.0)
       active_model_serializers
@@ -216,9 +220,6 @@ GEM
       websocket-driver (>= 0.4.0)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    foreman (0.75.0)
-      dotenv (~> 0.11.1)
-      thor (~> 0.19.1)
     foundation-rails (5.4.5.0)
       railties (>= 3.1.0)
       sass (>= 3.2.0)
@@ -229,35 +230,29 @@ GEM
       multi_json (~> 1.3)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
-    haml (4.0.5)
-      tilt
-    haml-rails (0.5.3)
-      actionpack (>= 4.0.1)
-      activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
-      railties (>= 4.0.1)
     handlebars-source (1.3.0)
-    hashie (3.3.1)
+    hashie (3.3.2)
     hike (1.2.3)
     http_parser.rb (0.6.0)
     i18n (0.7.0.beta1)
     iso_country_codes (0.6.1)
-    jquery-rails (3.1.2)
+    jquery-rails (4.0.0)
-      railties (>= 3.0, < 5.0)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0.beta, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.2)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     js-routes (0.9.9)
       railties (>= 3.2)
       sprockets-rails
     json (1.8.1)
-    jwt (1.0.0)
+    jwt (1.2.0)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.2.0)
+    letter_opener (1.3.0)
       launchy (~> 2.2)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
@@ -265,7 +260,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_magick (4.0.0)
+    mini_magick (4.0.1)
     mini_portile (0.6.1)
     minitest (5.4.3)
     multi_json (1.10.1)
@@ -274,7 +269,7 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -293,7 +288,7 @@ GEM
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
-    paperclip (4.2.0)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -306,36 +301,36 @@ GEM
       pry (>= 0.9.10)
     quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
-    rack (1.6.0.beta)
+    rack (1.6.0.beta2)
     rack-cors (0.2.9)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.2.0.beta4)
+    rails (4.2.0.rc2)
-      actionmailer (= 4.2.0.beta4)
+      actionmailer (= 4.2.0.rc2)
-      actionpack (= 4.2.0.beta4)
+      actionpack (= 4.2.0.rc2)
-      actionview (= 4.2.0.beta4)
+      actionview (= 4.2.0.rc2)
-      activejob (= 4.2.0.beta4)
+      activejob (= 4.2.0.rc2)
-      activemodel (= 4.2.0.beta4)
+      activemodel (= 4.2.0.rc2)
-      activerecord (= 4.2.0.beta4)
+      activerecord (= 4.2.0.rc2)
-      activesupport (= 4.2.0.beta4)
+      activesupport (= 4.2.0.rc2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta4)
+      railties (= 4.2.0.rc2)
-      sprockets-rails (~> 3.0.0.beta1)
+      sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.4)
+    rails-dom-testing (1.0.5)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)
-    railties (4.2.0.beta4)
+    railties (4.2.0.rc2)
-      actionpack (= 4.2.0.beta4)
+      actionpack (= 4.2.0.rc2)
-      activesupport (= 4.2.0.beta4)
+      activesupport (= 4.2.0.rc2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
-    rdoc (4.1.2)
+    rdoc (4.2.0)
       json (~> 1.4)
     responders (2.0.2)
       railties (>= 4.2.0.alpha, < 5)
@@ -367,15 +362,12 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     ruby-progressbar (1.7.0)
-    sass (3.4.8)
+    sass (3.4.9)
     sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2)
       sprockets (~> 2.12)
       sprockets-rails (>= 2.0, < 4.0)
-    simple_form (3.0.2)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -390,18 +382,18 @@ GEM
       railties (>= 3.0, < 4.2)
       slim (~> 2.0)
     slop (3.6.0)
-    spring (1.1.3)
+    spring (1.2.0)
-    spring-commands-rspec (1.0.2)
+    spring-commands-rspec (1.0.3)
       spring (>= 0.9.1)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (3.0.0.beta1)
+    sprockets-rails (2.2.2)
-      actionpack (>= 4.0)
+      actionpack (>= 3.0)
-      activesupport (>= 4.0)
+      activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sshkit (1.5.1)
       colorize
       net-scp (>= 1.1.2)
@@ -417,14 +409,14 @@ GEM
       rspec (>= 2.14.0, < 4.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warden (1.2.3)
       rack (>= 1.0)
-    web-console (2.0.0.beta4)
+    web-console (2.0.0)
       activemodel (~> 4.0)
-      binding_of_caller (= 0.7.3.pre1)
+      binding_of_caller (>= 0.7.2)
       railties (~> 4.0)
       sprockets-rails (>= 2.0, < 4.0)
     websocket-driver (0.4.0)
@@ -442,6 +434,7 @@ DEPENDENCIES
   capistrano (~> 3.0)
   capistrano-rails (~> 1.1)
   capistrano-rvm (~> 0.1)
+  capybara-screenshot
   capybara-webkit
   cmtool!
   coffee-rails
@@ -449,13 +442,12 @@ DEPENDENCIES
   devise!
   devise_simply_stored!
   ember-rails
-  ember-source
+  ember-source (= 1.8.1)
   ember_script-rails!
   emblem-rails
   factory_girl_rails
   faye
   font-awesome-rails
-  foreman
   foundation-rails
   fuubar
   iso_country_codes
@@ -471,12 +463,11 @@ DEPENDENCIES
   pry-rails
   quiet_assets
   rack-cors
-  rails (= 4.2.0.beta4)
+  rails (= 4.2.0.rc2)
   rqrcode
   rspec-its
   rspec-rails
   sass-rails (= 5.0.0.beta1)
-  simple_form
   simplecov
   simply_stored!
   slim-rails
@@ -484,4 +475,4 @@ DEPENDENCIES
   spring-commands-rspec
   turnip
   uglifier (>= 1.0.3)
-  web-console (~> 2.0.0.beta3)
+  web-console (~> 2.0.0)

config/initializers/simple_form.rb

@@ -1,142 +0,0 @@
-# Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
-  # Wrappers are used by the form builder to generate a
-  # complete input. You can remove any component from the
-  # wrapper, change the order or even add your own to the
-  # stack. The options given below are used to wrap the
-  # whole input.
-  config.wrappers :default, :class => :input,
-    :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
-    ## Extensions enabled by default
-    # Any of these extensions can be disabled for a
-    # given input by passing: `f.input EXTENSION_NAME => false`.
-    # You can make any of these extensions optional by
-    # renaming `b.use` to `b.optional`.
-
-    # Determines whether to use HTML5 (:email, :url, ...)
-    # and required attributes
-    b.use :html5
-
-    # Calculates placeholders automatically from I18n
-    # You can also pass a string as f.input :placeholder => "Placeholder"
-    b.use :placeholder
-
-    ## Optional extensions
-    # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
-    # to the input. If so, they will retrieve the values from the model
-    # if any exists. If you want to enable the lookup for any of those
-    # extensions by default, you can change `b.optional` to `b.use`.
-
-    # Calculates maxlength from length validations for string inputs
-    b.optional :maxlength
-
-    # Calculates pattern from format validations for string inputs
-    b.optional :pattern
-
-    # Calculates min and max from length validations for numeric inputs
-    b.optional :min_max
-
-    # Calculates readonly automatically from readonly attributes
-    b.optional :readonly
-
-    ## Inputs
-    b.use :label_input
-    b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    b.use :error, :wrap_with => { :tag => :span, :class => :error }
-  end
-
-  # The default wrapper to be used by the FormBuilder.
-  config.default_wrapper = :default
-
-  # Define the way to render check boxes / radio buttons with labels.
-  # Defaults to :nested for bootstrap config.
-  #   :inline => input + label
-  #   :nested => label > input
-  config.boolean_style = :nested
-
-  # Default class for buttons
-  config.button_class = 'button'
-
-  # Method used to tidy up errors. Specify any Rails Array method.
-  # :first lists the first message for each field.
-  # Use :to_sentence to list all errors for each field.
-  # config.error_method = :first
-
-  # Default tag used for error notification helper.
-  config.error_notification_tag = :div
-
-  # CSS class to add for error notification helper.
-  config.error_notification_class = 'alert alert-error'
-
-  # ID to add for error notification helper.
-  # config.error_notification_id = nil
-
-  # Series of attempts to detect a default label method for collection.
-  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
-
-  # Series of attempts to detect a default value method for collection.
-  # config.collection_value_methods = [ :id, :to_s ]
-
-  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
-  # config.collection_wrapper_tag = nil
-
-  # You can define the class to use on all collection wrappers. Defaulting to none.
-  # config.collection_wrapper_class = nil
-
-  # You can wrap each item in a collection of radio/check boxes with a tag,
-  # defaulting to :span. Please note that when using :boolean_style = :nested,
-  # SimpleForm will force this option to be a label.
-  # config.item_wrapper_tag = :span
-
-  # You can define a class to use in all item wrappers. Defaulting to none.
-  # config.item_wrapper_class = nil
-
-  # How the label text should be generated altogether with the required text.
-  # config.label_text = lambda { |label, required| "#{required} #{label}" }
-
-  # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'control-label'
-
-  # You can define the class to use on all forms. Default is simple_form.
-  # config.form_class = :simple_form
-
-  # You can define which elements should obtain additional classes
-  # config.generate_additional_classes_for = [:wrapper, :label, :input]
-
-  # Whether attributes are required by default (or not). Default is true.
-  # config.required_by_default = true
-
-  # Tell browsers whether to use default HTML5 validations (novalidate option).
-  # Default is enabled.
-  config.browser_validations = false
-
-  # Collection of methods to detect if a file type was given.
-  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
-
-  # Custom mappings for input types. This should be a hash containing a regexp
-  # to match as key, and the input type that will be used when the field name
-  # matches the regexp as value.
-  # config.input_mappings = { /count/ => :integer }
-
-  # Custom wrappers for input types. This should be a hash containing an input
-  # type as key and the wrapper that will be used for all inputs with specified type.
-  # config.wrapper_mappings = { :string => :prepend }
-
-  # Default priority for time_zone inputs.
-  # config.time_zone_priority = nil
-
-  # Default priority for country inputs.
-  # config.country_priority = nil
-
-  # Default size for text inputs.
-  # config.default_input_size = 50
-
-  # When false, do not use translations for labels.
-  # config.translate_labels = true
-
-  # Automatically discover new inputs in Rails' autoload path.
-  # config.inputs_discovery = true
-
-  # Cache SimpleForm inputs discovery
-  # config.cache_discovery = !Rails.env.development?
-end

config/initializers/simple_form_bootstrap.rb

@@ -1,45 +0,0 @@
-# Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
-      ba.use :input
-      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
-    end
-  end
-
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
-        prepend.use :input
-      end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-    end
-  end
-
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-append' do |append|
-        append.use :input
-      end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-    end
-  end
-
-  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
-  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
-  # to learn about the different styles for forms and inputs,
-  # buttons and other elements.
-  config.default_wrapper = :bootstrap
-end

config/routes.rb

@@ -1,3 +1,4 @@
+ALLOWED_LOCALES = /nl|be|de|fr|en/
 Qwaiter::Application.routes.draw do
   devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
   devise_for :suppliers, controllers: { confirmations: 'confirmations', registrations: 'registrations' }
@@ -211,7 +212,6 @@ Qwaiter::Application.routes.draw do
   #
   #root :to => 'dashboard#home'
   root :to => 'pages#home', defaults: {locale: 'nl'}
-  ALLOWED_LOCALES = /nl|be|de|fr|en/
   get '/:locale' => 'pages#home', constraints: {locale: ALLOWED_LOCALES}
   devise_scope :supplier do
     get '/:locale/suppliers/sign_up' => 'registrations#new', constraints: {locale: ALLOWED_LOCALES}

spec/acceptance_steps/users/order_products_steps.rb

@@ -31,6 +31,7 @@ step "there is a signed in user with an active order" do
   step "I am signed in as a user"
   step "the user has an active order"
 end
+
 step "there is a signed in user with a placed order" do
   step "I am signed in as a user"
   step "the user has a placed order"

spec/acceptance_steps/users/side_menu_steps.rb

@@ -9,7 +9,7 @@ end
 
 step "the user clicks on the lists link in the side menu" do
   page.execute_script %|$('.side-menu-lists').click()|
-  sleep 1
+  sleep 2
 end
 
 step "the user clicks on the about link in the side menu" do

spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'rspec/matchers'
 require 'capybara/rspec'
 require 'turnip/capybara'
 require 'in_memory_q_counter'
+require 'capybara-screenshot/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -18,7 +19,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.default_wait_time = 6 # ember needs more time than the default of 2
+Capybara.default_wait_time = 4 # ember needs more time than the default of 2
+Capybara::Screenshot.webkit_options = { width: 1024, height: 768 }
+
 #Capybara.javascript_driver = :selenium
 
 module FactoryAttributesFor

test/performance/browsing_test.rb

@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
-
-  def test_homepage
-    get '/'
-  end
-end

test/test_helper.rb

@@ -1,13 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end