Initialize rails 4 migration

116 files changed, 1620 insertions, 1415 deletions

diff --git a/Gemfile b/Gemfile
index 755ffa598..745c0f185 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,42 @@
 source 'http://rubygems.org'
 source 'https://rails-assets.org'
 
-gem 'rails', '3.2.18'
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.1.8'
+
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.3'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+gem 'jquery-ui-sass-rails'
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0', group: :doc
+
+# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+gem 'spring', group: :development
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]
+
+
 gem 'rest_client'
 
 platforms :jruby do
@@ -14,12 +49,12 @@ end
 
 platforms :ruby do
   gem 'therubyracer', '~> 0.10.2'
-  gem 'pg', '~> 0.11.0'
+  gem 'pg'
   gem 'sqlite3'
 end
 
 # Authentication
-gem 'devise', '2.1.3'
+gem 'devise', '~> 3.4.0'
 gem 'devise-i18n'
 gem 'devise-encryptable'
 gem 'devise_invitable'
@@ -30,22 +65,13 @@ gem "georuby-ext", "0.0.5"
 gem "georuby", "2.3.0" # Fix version for georuby-ext because api has changed
 
 # User interface
-gem 'language_engine', '0.0.5'
+gem 'language_engine', '0.0.6'
 gem 'calendar_helper', "0.2.5"
-gem 'cocoon', "1.1.2"
+gem 'cocoon'
 gem 'formtastic', "2.3.1"
 gem 'RedCloth'
 
-# some views use coffee script
-gem 'coffee-rails', '~> 3.2.1'
-gem 'coffee-script-source'
-
-gem 'sass-rails',   '~> 3.2.3'
-gem 'uglifier', '>= 1.0.3'
-
 # Javascript
-gem 'jquery-rails', '2.2.1'
-gem 'jquery-ui-sass-rails'
 gem "modernizr-rails", "~> 2.0.6"
 gem 'morrisjs-rails'
 gem 'raphael-rails'
@@ -54,7 +80,7 @@ gem 'raphael-rails'
 gem 'rails-assets-bootstrap-sass-official', '~> 3.3.0'
 gem 'font-awesome-sass', '~> 4.2.0'
 gem 'will_paginate-bootstrap'
-gem 'simple_form', "2.1.1"
+gem 'simple_form'
 gem 'rails-assets-tagmanager', '~> 3.0.1.0'
 gem 'rails-assets-typeahead.js', '~> 0.10.5'
 gem "breadcrumbs_on_rails"
@@ -76,18 +102,17 @@ gem 'google-analytics-rails'
 gem 'will_paginate', '~> 3.0'
 gem 'ransack'
 gem 'squeel'
-gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
+gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => "rails4"
 #gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
 #gem 'ninoxe', '~> 1.1.3'
 
-gem 'acts_as_list', '0.1.6'
-gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree"
-gem "active_enum"
+gem 'acts_as_list', '~> 0.6.0'
+gem "acts_as_tree", '~> 2.1.0', :require => "acts_as_tree"
 
 gem 'rabl'
 
 gem 'delayed_job_active_record'
-gem 'dr-apartment', :require => "apartment"
+gem 'apartment'
 
 group :development do
   gem 'capistrano'
@@ -99,16 +124,15 @@ group :development do
 end
 
 group :test, :development do
-  gem "rspec-rails", "~> 2.0"
-  gem "remarkable", "~> 4.0.0.alpha4"
-  gem "remarkable_activerecord", "~> 4.0.0.alpha4"
-  gem "shoulda-matchers"
-  gem 'capybara'
+  gem "rspec-rails", "~> 3.1.0"
+  gem 'capybara', "~> 2.4.0"
   gem 'launchy'
   gem 'factory_girl_rails', '1.7'
   # gem 'i18n-tasks'
   gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
   gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+  gem 'transpec'
+  gem 'database_cleaner'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b23554c4..7206994bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,10 @@
 GIT
   remote: https://github.com/afimb/ninoxe.git
-  revision: 37fdb46bfa9c089a231ea5e7e093a9b78cc11b5e
+  revision: bfe0ccb3519e6b0e4e99657c1f108d07754ff7c7
+  branch: rails4
   specs:
     ninoxe (1.1.3)
-      activerecord (~> 3.2.13)
+      activerecord (~> 4.1.1)
       acts-as-taggable-on (>= 3)
       acts_as_list (>= 0.1.6)
       acts_as_tree (>= 1.1.0)
@@ -19,55 +20,55 @@ GEM
     RedCloth (4.2.9)
     RedCloth (4.2.9-java)
     SyslogLogger (1.4.1)
-    actionmailer (3.2.18)
-      actionpack (= 3.2.18)
-      mail (~> 2.5.4)
-    actionpack (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-      builder (~> 3.0.0)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    active_enum (0.9.12)
-      activesupport (~> 3.0)
-    activemodel (3.2.18)
-      activesupport (= 3.2.18)
-      builder (~> 3.0.0)
-    activerecord (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.11)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
+      arel (~> 5.0.0)
+    activerecord-jdbc-adapter (1.3.13)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.11)
-      activerecord-jdbc-adapter (~> 1.3.11)
+    activerecord-jdbcpostgresql-adapter (1.3.13)
+      activerecord-jdbc-adapter (~> 1.3.13)
       jdbc-postgres (>= 9.1)
-    activeresource (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-    activesupport (3.2.18)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     acts-as-taggable-on (3.4.2)
       activerecord (>= 3.2, < 5)
-    acts_as_list (0.1.6)
-    acts_as_tree-1.8 (1.1.0)
-      activerecord (>= 3.0.0)
+    acts_as_list (0.6.0)
+      activerecord (>= 3.0)
     acts_as_tree (2.1.0)
       activerecord (>= 3.0.0)
     addressable (2.3.5)
-    arel (3.0.3)
-    bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-java)
-    bourne (1.5.0)
-      mocha (>= 0.13.2, < 0.15)
+    apartment (0.25.2)
+      activerecord (>= 3.1.2, < 4.2)
+      rack (>= 1.3.6)
+    arel (5.0.1.20140414130214)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    bcrypt (3.1.9)
+    bcrypt (3.1.9-java)
     breadcrumbs_on_rails (2.3.0)
-    builder (3.0.4)
+    builder (3.2.2)
     calendar_helper (0.2.5)
       open4
     callsite (0.0.11)
@@ -79,55 +80,55 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
-    capybara (1.1.2)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.5.3)
-      ffi (~> 1.0, >= 1.0.11)
-    choice (0.1.6)
-    cocoon (1.1.2)
-    coffee-rails (3.2.2)
+      xpath (~> 2.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    choice (0.1.7)
+    cocoon (1.2.6)
+    coderay (1.1.0)
+    coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.8.0)
     daemons (1.1.9)
+    database_cleaner (1.4.0)
     dbf (2.0.7)
       fastercsv (~> 1.5.4)
-    deep_cloneable (2.0.0)
+    deep_cloneable (2.0.2)
       activerecord (>= 3.1.0, < 5.0.0)
-    delayed_job (3.0.3)
-      activesupport (~> 3.0)
-    delayed_job_active_record (0.3.2)
-      activerecord (> 2.1.0)
-      delayed_job (~> 3.0.0)
-    devise (2.1.3)
-      bcrypt-ruby (~> 3.0)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
+      delayed_job (>= 3.0, < 4.1)
+    devise (3.4.1)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    devise-encryptable (0.1.2)
+      railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    devise-encryptable (0.2.0)
       devise (>= 2.1.0)
     devise-i18n (0.10.3)
-    devise_invitable (1.1.0)
-      actionmailer (~> 3.0)
-      devise (>= 2.1.0)
-      railties (~> 3.0)
+    devise_invitable (1.4.0)
+      actionmailer (>= 3.2.6, < 5)
+      devise (>= 3.2.0)
     diff-lcs (1.2.5)
-    dr-apartment (0.14.1)
     dr-ffi-proj4 (0.0.3)
       ffi (>= 1.0.0)
     enumerize (0.8.0)
       activesupport (>= 3.2)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.2.2)
     factory_girl (2.6.4)
       activesupport (>= 2.3.9)
     factory_girl_rails (1.7.0)
@@ -142,6 +143,7 @@ GEM
       sass (~> 3.2)
     foreigner (1.6.0)
       activerecord (>= 3.0.0)
+    formatador (0.2.5)
     formtastic (2.3.1)
       actionpack (>= 3.0)
     geokit (1.6.7)
@@ -156,22 +158,33 @@ GEM
       georuby (>= 1.9.8)
       rgeo (>= 0.3.20)
     google-analytics-rails (0.0.4)
-    guard (1.3.2)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
+    guard (2.10.5)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-compat (1.2.0)
+    guard-rspec (4.5.0)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     has_scope (0.6.0.rc)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
     highline (1.6.15)
     hike (1.2.3)
-    i18n (0.6.11)
+    hitimes (1.2.2)
+    hitimes (1.2.2-java)
+    i18n (0.7.0)
     inherited_resources (1.4.1)
       has_scope (~> 0.6.0.rc)
       responders (~> 1.0.0.rc)
+    jbuilder (2.2.6)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
     jdbc-postgres (9.3.1102)
-    journey (1.0.4)
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -189,31 +202,32 @@ GEM
       jruby-rack (>= 1.1.10)
     json (1.8.1)
     json (1.8.1-java)
-    language_engine (0.0.5)
-      rails (~> 3.2.18)
+    language_engine (0.0.6)
+      rails (~> 4.1.1)
     launchy (2.3.0)
       addressable (~> 2.3)
     libv8 (3.3.10.4)
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    listen (2.8.4)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     map_layers (0.0.4)
     meta_request (0.3.4)
       callsite (~> 0.0, >= 0.0.11)
       rack-contrib (~> 1.1)
       railties (>= 3.0.0, < 5.0.0)
-    metaclass (0.0.1)
-    mime-types (1.25.1)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
+    method_source (0.8.2)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.0)
     modernizr-rails (2.0.6)
     morrisjs-rails (0.4.3)
       railties (> 3.1, < 5)
     multi_json (1.10.1)
+    nenv (0.1.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -222,33 +236,43 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     netrc (0.7.9)
-    nokogiri (1.5.10)
-    nokogiri (1.5.10-java)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.5-java)
     open4 (1.3.0)
-    orm_adapter (0.4.0)
-    pg (0.11.0)
+    orm_adapter (0.5.0)
+    parser (2.2.0.pre.7)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
+    pg (0.17.1)
     polyamorous (1.1.0)
       activerecord (>= 3.0)
-    polyglot (0.3.5)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rabl (0.11.4)
       activesupport (>= 2.3.14)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
+    rack (1.5.2)
     rack-contrib (1.2.0)
       rack (>= 0.9.1)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.18)
-      actionmailer (= 3.2.18)
-      actionpack (= 3.2.18)
-      activerecord (= 3.2.18)
-      activeresource (= 3.2.18)
-      activesupport (= 3.2.18)
-      bundler (~> 1.0)
-      railties (= 3.2.18)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.8)
+      sprockets-rails (~> 2.0)
     rails-assets-bootstrap (3.1.1)
       rails-assets-jquery (>= 1.9.0)
     rails-assets-bootstrap-sass-official (3.3.0)
@@ -274,14 +298,13 @@ GEM
       activesupport (>= 3.0)
       choice (~> 0.1.6)
       ruby-graphviz (~> 1.0.4)
-    railties (3.2.18)
-      actionpack (= 3.2.18)
-      activesupport (= 3.2.18)
-      rack-ssl (~> 1.3.2)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (2.0.0)
+    rake (10.4.2)
     ransack (1.4.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -289,22 +312,11 @@ GEM
       i18n
       polyamorous (~> 1.1)
     raphael-rails (2.1.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (3.12.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    remarkable (4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
-    remarkable_activemodel (4.0.0.alpha4)
-      remarkable (~> 4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
-    remarkable_activerecord (4.0.0.alpha4)
-      remarkable (~> 4.0.0.alpha4)
-      remarkable_activemodel (~> 4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
     responders (1.0.0)
       railties (>= 3.2, < 5)
     rest_client (1.8.2)
@@ -314,47 +326,56 @@ GEM
       nokogiri
       rubyzip
       spreadsheet (> 0.6.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     ruby-graphviz (1.0.9)
     ruby-ole (1.2.11.7)
     rubyzip (1.1.6)
-    sass (3.4.5)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    selenium-webdriver (2.43.0)
-      childprocess (~> 0.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
-    shoulda-matchers (1.5.6)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    simple_form (2.1.1)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
+    sass (3.2.19)
+    sass-rails (4.0.5)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    simple_form (3.1.0)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
+    slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     spreadsheet (0.9.7)
       ruby-ole (>= 1.0)
-    sprockets (2.2.3)
+    spring (1.2.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.6)
     squeel (1.2.1)
       activerecord (>= 3.0)
@@ -366,26 +387,36 @@ GEM
       therubyrhino_jar (>= 1.7.3)
     therubyrhino_jar (1.7.4)
     thor (0.19.1)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.42)
-    uglifier (1.2.7)
+    timers (4.0.1)
+      hitimes
+    transpec (2.3.7)
+      activesupport (>= 3.0, < 5.0)
+      astrolabe (~> 1.2)
+      bundler (~> 1.3)
+      json (~> 1.8)
+      parser (>= 2.2.0.pre.3, < 3.0)
+      rainbow (>= 1.99.1, < 3.0)
+    turbolinks (2.5.3)
+      coffee-rails
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.6.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
+      json (>= 1.8.0)
     warbler (1.4.4)
       jruby-jars (>= 1.5.6, < 2.0)
       jruby-rack (>= 1.0.0)
       rake (>= 0.9.6)
       rubyzip (>= 0.9, < 1.2)
-    warden (1.2.1)
+    warden (1.2.3)
       rack (>= 1.0)
-    websocket (1.2.1)
     will_paginate (3.0.5)
     will_paginate-bootstrap (1.0.0)
       will_paginate (>= 3.0.3)
-    xpath (0.1.4)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -395,25 +426,24 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   SyslogLogger
-  active_enum
   activerecord-jdbcpostgresql-adapter (~> 1.3.3)
-  acts_as_list (= 0.1.6)
-  acts_as_tree-1.8 (= 1.1.0)
+  acts_as_list (~> 0.6.0)
+  acts_as_tree (~> 2.1.0)
+  apartment
   breadcrumbs_on_rails
   calendar_helper (= 0.2.5)
   capistrano
   capistrano-ext
-  capybara
-  cocoon (= 1.1.2)
-  coffee-rails (~> 3.2.1)
-  coffee-script-source
+  capybara (~> 2.4.0)
+  cocoon
+  coffee-rails (~> 4.0.0)
   daemons
+  database_cleaner
   delayed_job_active_record
-  devise (= 2.1.3)
+  devise (~> 3.4.0)
   devise-encryptable
   devise-i18n
   devise_invitable
-  dr-apartment
   factory_girl_rails (= 1.7)
   font-awesome-sass (~> 4.2.0)
   formtastic (= 2.3.1)
@@ -423,21 +453,22 @@ DEPENDENCIES
   guard
   guard-rspec
   inherited_resources
-  jquery-rails (= 2.2.1)
+  jbuilder (~> 2.0)
+  jquery-rails
   jquery-ui-sass-rails
   jruby-openssl
   jruby-rack-worker
   json
-  language_engine (= 0.0.5)
+  language_engine (= 0.0.6)
   launchy
   map_layers (= 0.0.4)
   meta_request
   modernizr-rails (~> 2.0.6)
   morrisjs-rails
   ninoxe!
-  pg (~> 0.11.0)
+  pg
   rabl
-  rails (= 3.2.18)
+  rails (= 4.1.8)
   rails-assets-bootstrap-sass-official (~> 3.3.0)
   rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3)
   rails-assets-jquery-tokeninput (~> 1.7.0)
@@ -450,20 +481,21 @@ DEPENDENCIES
   raphael-rails
   rb-fsevent
   rb-inotify
-  remarkable (~> 4.0.0.alpha4)
-  remarkable_activerecord (~> 4.0.0.alpha4)
   rest_client
   roo
-  rspec-rails (~> 2.0)
+  rspec-rails (~> 3.1.0)
   rubyzip (~> 1.1.6)
-  sass-rails (~> 3.2.3)
-  shoulda-matchers
-  simple_form (= 2.1.1)
+  sass-rails (~> 4.0.3)
+  sdoc (~> 0.4.0)
+  simple_form
+  spring
   sqlite3
   squeel
   therubyracer (~> 0.10.2)
   therubyrhino
-  uglifier (>= 1.0.3)
+  transpec
+  turbolinks
+  uglifier (>= 1.3.0)
   warbler
   will_paginate (~> 3.0)
   will_paginate-bootstrap
diff --git a/Guardfile b/Guardfile
index 8f357db7d..c6ea0689a 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,19 +1,30 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 2, :notification => false do
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 
   # Rails example
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
 
diff --git a/app/controllers/api/v1/chouette_controller.rb b/app/controllers/api/v1/chouette_controller.rb
index b8879cd3f..c1d626adf 100644
--- a/app/controllers/api/v1/chouette_controller.rb
+++ b/app/controllers/api/v1/chouette_controller.rb
@@ -17,7 +17,7 @@ private
         end
       end
       def switch_referential
-        Apartment::Database.switch(@api_key.referential.slug)
+        Apartment::Tenant.switch(@api_key.referential.slug)
       end 
 
     end
diff --git a/app/controllers/autocomplete_stop_areas_controller.rb b/app/controllers/autocomplete_stop_areas_controller.rb
index 64a62efe5..2d4a07002 100644
--- a/app/controllers/autocomplete_stop_areas_controller.rb
+++ b/app/controllers/autocomplete_stop_areas_controller.rb
@@ -4,7 +4,7 @@ class AutocompleteStopAreasController < InheritedResources::Base
   before_filter :switch_referential
   
   def switch_referential
-    Apartment::Database.switch(referential.slug)
+    Apartment::Tenant.switch(referential.slug)
   end
 
   def referential
diff --git a/app/controllers/chouette_controller.rb b/app/controllers/chouette_controller.rb
index df082d8cd..204a3d6c5 100644
--- a/app/controllers/chouette_controller.rb
+++ b/app/controllers/chouette_controller.rb
@@ -6,7 +6,7 @@ class ChouetteController < BreadcrumbController
   before_filter :switch_referential
   
   def switch_referential
-    Apartment::Database.switch(referential.slug)
+    Apartment::Tenant.switch(referential.slug)
   end 
 
   def referential
diff --git a/app/models/compliance_check_result.rb b/app/models/compliance_check_result.rb
index 72cb4f13e..f34cf7911 100644
--- a/app/models/compliance_check_result.rb
+++ b/app/models/compliance_check_result.rb
@@ -7,7 +7,7 @@ class ComplianceCheckResult < ActiveRecord::Base
   scope :nok, -> { where status: 'nok' }
   scope :na, -> { where status: 'na' }
 
-  attr_accessible :violation_count
+  #attr_accessible :violation_count
   belongs_to :compliance_check_task
 
   validates_presence_of :rule_code
diff --git a/app/models/compliance_check_task.rb b/app/models/compliance_check_task.rb
index 1808a792c..ef35fcbdc 100644
--- a/app/models/compliance_check_task.rb
+++ b/app/models/compliance_check_task.rb
@@ -10,7 +10,7 @@ class ComplianceCheckTask < ActiveRecord::Base
   validates_presence_of :user_name
   validates_inclusion_of :status, :in => %w{ pending processing completed failed }
 
-  has_many :compliance_check_results, :order => [ :severity , :status ]
+  has_many :compliance_check_results, -> { order([ :severity , :status ]) }
 
   serialize :parameter_set, JSON
 
diff --git a/app/models/export.rb b/app/models/export.rb
index 4d7b5c56c..99e499c2d 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -5,7 +5,7 @@ class Export < ActiveRecord::Base
 
   validates_inclusion_of :status, :in => %w{ pending processing completed failed }
 
-  has_many :log_messages, :class_name => "ExportLogMessage", :order => :position, :dependent => :delete_all
+  has_many :log_messages, -> { order('position ASC') }, :class_name => "ExportLogMessage", :dependent => :delete_all
 
   serialize :options
 
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 41d239961..e5646d7e9 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -50,43 +50,43 @@ class Referential < ActiveRecord::Base
   end
 
   def lines
-    Chouette::Line.scoped
+    Chouette::Line.all
   end
 
   def networks
-    Chouette::Network.scoped
+    Chouette::Network.all
   end
 
   def group_of_lines
-    Chouette::GroupOfLine.scoped
+    Chouette::GroupOfLine.all
   end
 
   def companies
-    Chouette::Company.scoped
+    Chouette::Company.all
   end
 
   def stop_areas
-    Chouette::StopArea.scoped
+    Chouette::StopArea.all
   end
 
   def access_points
-    Chouette::AccessPoint.scoped
+    Chouette::AccessPoint.all
   end
 
   def access_links
-    Chouette::AccessLink.scoped
+    Chouette::AccessLink.all
   end
 
   def time_tables
-    Chouette::TimeTable.scoped
+    Chouette::TimeTable.all
   end
 
   def connection_links
-    Chouette::ConnectionLink.scoped
+    Chouette::ConnectionLink.all
   end
 
   def vehicle_journeys
-    Chouette::VehicleJourney.scoped
+    Chouette::VehicleJourney.all
   end
 
   after_initialize :define_default_attributes
@@ -97,7 +97,7 @@ class Referential < ActiveRecord::Base
 
   def switch
     raise "Referential not created" if new_record?
-    Apartment::Database.switch(slug)
+    Apartment::Tenant.switch(slug)
     self
   end
 
@@ -139,12 +139,12 @@ class Referential < ActiveRecord::Base
 
   before_create :create_schema
   def create_schema
-    Apartment::Database.create slug
+    Apartment::Tenant.create slug
   end
 
   before_destroy :destroy_schema
   def destroy_schema
-    Apartment::Database.drop slug
+    Apartment::Tenant.drop slug
   end
 
   after_create :add_rule_parameter_set
@@ -202,7 +202,7 @@ Rails.application.config.after_initialize do
 
     # add referential relationship for objectid and localization functions
     def referential
-      @referential ||= Referential.where(:slug => Apartment::Database.current_database).first!
+      @referential ||= Referential.where(:slug => Apartment::Tenant.current_tenant).first!
     end
 
     # override prefix for good prefix in objectid generation
@@ -216,7 +216,7 @@ Rails.application.config.after_initialize do
 
   class Chouette::StopArea
 
-    attr_accessible :projection_x,:projection_y,:projection_xy
+    #attr_accessible :projection_x,:projection_y,:projection_xy
 
     # override default_position method to add referential envelope when no stoparea is positioned
     def default_position
@@ -282,7 +282,7 @@ Rails.application.config.after_initialize do
   Chouette::AccessPoint
 
   class Chouette::AccessPoint
-    attr_accessible :projection_x,:projection_y,:projection_xy
+    #attr_accessible :projection_x,:projection_y,:projection_xy
 
     # add projection_type set on pre-insert and pre_update action
     before_save :set_projections
diff --git a/app/models/rule_parameter_set.rb b/app/models/rule_parameter_set.rb
index 0c7a98300..b8c5a2f8f 100644
--- a/app/models/rule_parameter_set.rb
+++ b/app/models/rule_parameter_set.rb
@@ -6,7 +6,7 @@ class RuleParameterSet < ActiveRecord::Base
 
   serialize :parameters, JSON
 
-  attr_accessible :name, :referential_id
+  #attr_accessible :name, :referential_id
 
   def self.mode_attribute_prefixes
     %w( allowed_transport inter_stop_area_distance_min inter_stop_area_distance_max speed_max speed_min inter_stop_duration_variation_max)
@@ -39,7 +39,7 @@ class RuleParameterSet < ActiveRecord::Base
 
   def self.mode_parameter(name)
     name = name.to_s
-    attr_accessible name
+    #attr_accessible name
 
     define_method(name) do
       attribute_name, mode = RuleParameterSet.attribute_of_mode_attribute( name), RuleParameterSet.mode_of_mode_attribute( name)
@@ -54,7 +54,7 @@ class RuleParameterSet < ActiveRecord::Base
   end
   def self.parameter(name)
     name = name.to_s
-    attr_accessible name
+    #attr_accessible name
 
     define_method(name) do
         self.parameters and self.parameters[name]
diff --git a/app/models/user.rb b/app/models/user.rb
index 6c14b93fb..e37ff62d5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,7 +6,7 @@ class User < ActiveRecord::Base
          :confirmable, :invitable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :current_password, :password_confirmation, :remember_me, :name, :organisation_attributes
+  # attr_accessible :email, :password, :current_password, :password_confirmation, :remember_me, :name, :organisation_attributes
 
   belongs_to :organisation
 
diff --git a/app/views/companies/_companies.erb b/app/views/companies/_companies.erb
index fb36a86af..f059201e6 100644
--- a/app/views/companies/_companies.erb
+++ b/app/views/companies/_companies.erb
@@ -1,5 +1,5 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @companies %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info(@companies) %>
 </div>
 <div class="companies paginated_content">
    <%= paginated_content(@companies) %>
diff --git a/config/application.rb b/config/application.rb
index d86b254f3..7c0a6c42a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,14 +2,19 @@ require File.expand_path('../boot', __FILE__)
 
 ENV['RANSACK_FORM_BUILDER'] = '::SimpleForm::FormBuilder'
 
-require 'rails/all'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 module ChouetteIhm
   class Application < Rails::Application
diff --git a/config/database.yml b/config/database.yml
index 1685c484f..08d265760 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,35 +1,24 @@
-# SQLite version 3.x
-#   gem 'activerecord-jdbcsqlite3-adapter'
-#
-# Configure Using Gemfile
-# gem 'activerecord-jdbcsqlite3-adapter'
-#
-development:
-  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
-  database: chouette_dev
-  encoding: utf8
-  host: localhost
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
   port: 5432
+  host: localhost
+  schema_search_path: "public"
   username: chouette
   password: chouette
 
+development:
+  <<: *default
+  database: chouette_dev
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
+  <<: *default
   database: chouette_test
-  encoding: utf8
-  host: localhost
-  port: 5432
-  username: chouette
-  password: chouette
 
 production:
-  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
+  <<: *default
   database: chouette2
-  encoding: utf8
-  host: localhost
-  port: 5432
-  username: chouette
-  password: chouette
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0d33ac03c..3000da9f2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -23,22 +23,25 @@ ChouetteIhm::Application.configure do
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = false
 
-  # Expands the lines which load the assets
-  config.assets.debug = true
+   # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
   # uncomment to show chouette error view in development
   #config.consider_all_requests_local = false
 
-  config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5)
-
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
   # replace this with your production tracker code
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a320dc448..07aff1a84 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -4,76 +4,100 @@ ChouetteIhm::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = true
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = false
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
   # Generate digests for assets URLs
   config.assets.digest = true
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
-
-  # Specifies the header that your server uses for sending files
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
+  
+  # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  #config.log_level = :info
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
 
-  # Use a different logger for distributed setups
-  #if ENV['OS'] == 'Windows_NT'
-  #  # args = log_path,number of files,file sizes
-  #  config.logger = Logger.new("C:/chouette/logs/chouette2.log", 5, 10.megabytes)
-  #else
-  require 'syslog_logger'
-  config.logger = SyslogLogger.new("rails/chouette2").tap do |logger|
-    logger.level = Logger::INFO
-  end
-  #end
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different cache store in production
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "chouette2"
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
   # config.assets.precompile += %w( search.js )
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
-  
-  # Enable threaded mode
-  # NOTICE : With Rails 3.2, Delayed::JRubyWorker blocks the application without threaded mode
-  # config.threadsafe!
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+  
+  # Use a different logger for distributed setups
+  #if ENV['OS'] == 'Windows_NT'
+  #  # args = log_path,number of files,file sizes
+  #  config.logger = Logger.new("C:/chouette/logs/chouette2.log", 5, 10.megabytes)
+  #else
+  require 'syslog_logger'
+  config.logger = SyslogLogger.new("rails/chouette2").tap do |logger|
+    logger.level = Logger::INFO
+  end
+  #end
+
   if ENV['CHOUETTE_BASE_URL'].nil?
      config.action_mailer.default_url_options = { :host => 'my-domain-name.com' }
   else
      config.action_mailer.default_url_options = { :host => ENV['CHOUETTE_BASE_URL'] }
   end  
   
-
   # Configure the e-mail address which will be shown in Devise::Maile
   if ENV['CHOUETTE_MAIL_SENDER'].nil?
      config.mailer_sender = "chouette-production@my-domain-name.com"
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d5a5fe5e8..661865fd0 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -7,6 +7,11 @@ ChouetteIhm::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+  
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
@@ -24,9 +29,6 @@ ChouetteIhm::Application.configure do
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
 
-# Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Configure the e-mail address which will be shown in Devise::Maile
   config.mailer_sender = "appli@chouette.mobi"
 
@@ -44,6 +46,9 @@ ChouetteIhm::Application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
   # replace this with your production tracker code
   GA.tracker = "UA-AAAAAAAA"
 
diff --git a/config/initializers/active_enum.rb b/config/initializers/active_enum.rb
index cabf0bf7b..ae371bfa4 100644
--- a/config/initializers/active_enum.rb
+++ b/config/initializers/active_enum.rb
@@ -1,24 +1,24 @@
-# Form helper integration
-# require 'active_enum/form_helpers/formtastic'  # for Formtastic <2
-require 'active_enum/form_helpers/formtastic2' # for Formtastic 2.x
+# # Form helper integration
+# # require 'active_enum/form_helpers/formtastic'  # for Formtastic <2
+# require 'active_enum/form_helpers/formtastic2' # for Formtastic 2.x
 
-ActiveEnum.setup do |config|
+# ActiveEnum.setup do |config|
 
-  # Extend classes to add enumerate method
-  # config.extend_classes = [ ActiveRecord::Base ]
+#   # Extend classes to add enumerate method
+#   # config.extend_classes = [ ActiveRecord::Base ]
 
-  # Return name string as value for attribute method
-  # config.use_name_as_value = false
+#   # Return name string as value for attribute method
+#   # config.use_name_as_value = false
 
-  # Storage of values (:memory, :i18n)
-  # config.storage = :memory
+#   # Storage of values (:memory, :i18n)
+#   # config.storage = :memory
 
-end
-
-# ActiveEnum.define do
-# 
-#   enum(:enum_name) do
-#     value 1 => 'Name'
-#   end
-# 
 # end
+
+# # ActiveEnum.define do
+# # 
+# #   enum(:enum_name) do
+# #     value 1 => 'Name'
+# #   end
+# # 
+# # end
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 095ee9aff..03ae0ed0a 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -1,7 +1,48 @@
+# Require whichever elevator you're using below here...
+#
+# require 'apartment/elevators/generic'
+# require 'apartment/elevators/domain'
+# require 'apartment/elevators/subdomain'
+
+#
+# Apartment Configuration
+#
 Apartment.configure do |config|
-  # set your options (described below) here
-  config.excluded_models = ["Referential", "Organisation", "User", "ImportTask", "Export", "ExportLogMessage","ComplianceCheckTask", "ComplianceCheckResult", "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey", "RuleParameterSet"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
 
-  # Dynamically get database names to migrate
-  config.database_names = lambda{ Referential.pluck(:slug) }
+  # These models will not be multi-tenanted,
+  # but remain in the global (public) namespace
+  #
+  # An example might be a Customer or Tenant model that stores each tenant information
+  # ex:
+  #
+  # config.excluded_models = %w{Tenant}
+  #
+  config.excluded_models = ["Referential", "Organisation", "User", "ImportTask", "Export", "ExportLogMessage","ComplianceCheckTask", "ComplianceCheckResult", "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey", "RuleParameterSet"]
+
+  # use postgres schemas?
+  config.use_schemas = true
+
+  # use raw SQL dumps for creating postgres schemas? (only appies with use_schemas set to true)
+  #config.use_sql = true
+
+  # configure persistent schemas (E.g. hstore )
+  # config.persistent_schemas = %w{ hstore }
+
+  # add the Rails environment to database names?
+  # config.prepend_environment = true
+  # config.append_environment = true
+
+  # supply list of database names for migrations to run on
+  config.tenant_names = lambda{ Referential.pluck :slug }
 end
+
+##
+# Elevator Configuration
+
+# Rails.application.config.middleware.use 'Apartment::Elevators::Generic', lambda { |request|
+#   # TODO: supply generic implementation
+# }
+
+# Rails.application.config.middleware.use 'Apartment::Elevators::Domain'
+
+# Rails.application.config.middleware.use 'Apartment::Elevators::Subdomain'
diff --git a/config/initializers/db_migrate_in_war.rb b/config/initializers/db_migrate_in_war.rb
index ccba79773..662c512af 100644
--- a/config/initializers/db_migrate_in_war.rb
+++ b/config/initializers/db_migrate_in_war.rb
@@ -1,10 +1,10 @@
-Rails.configuration.after_initialize do
-  Rails.logger.info "Migrating database"
-  ActiveRecord::Migrator.migrate("db/migrate/", nil)
+# Rails.configuration.after_initialize do
+#   Rails.logger.info "Migrating database"
+#   ActiveRecord::Migrator.migrate("db/migrate/", nil)
 
-  Apartment.database_names.each do |db|
-    Rails.logger.info "Migrating #{db} schema"
-    Apartment::Migrator.migrate db
-  end
-end if ENV["CHOUETTE_RUN_MIGRATIONS"] == "true"
+#   Apartment.database_names.each do |db|
+#     Rails.logger.info "Migrating #{db} schema"
+#     Apartment::Migrator.migrate db
+#   end
+# end if ENV["CHOUETTE_RUN_MIGRATIONS"] == "true"
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 8434a26c8..23cb26e8f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -85,6 +85,8 @@ Devise.setup do |config|
   # a value less than 10 in other environments.
   config.stretches = Rails.env.test? ? 1 : 10
 
+  config.secret_key = 'e9b20cea45078c982c9cd42cc64c484071d582a3d366ad2b51f676d168bccb2e0fd20e87ebe64aff57ad7f8a1a1c50b76cb9dc4039c287a195f9621fdb557993'
+  
   # Setup a pepper to generate the encrypted password.
   # config.pepper = "0420ef6a1b6b0ac63b9ac1e2b9624b411e331345a1bad99c85986f70aef62e9c7912955ea1616135224fc7c4ac319085a5e33831fb215a5e45043816746a2c2f"
 
diff --git a/config/initializers/postgresql_adapter_patch.rb b/config/initializers/postgresql_adapter_patch.rb
index 42968bbdf..ae228f62f 100644
--- a/config/initializers/postgresql_adapter_patch.rb
+++ b/config/initializers/postgresql_adapter_patch.rb
@@ -1,12 +1,12 @@
-module ::ArJdbc
-  module PostgreSQL
-    def quote_column_name(name)
-      if name.is_a?(Array)
-        name.collect { |n| %("#{n.to_s.gsub("\"", "\"\"")}") }.join(',')
-      else
-        %("#{name.to_s.gsub("\"", "\"\"")}")
-      end
-    end
-  end
-end
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key"
+# module ::ArJdbc
+#   module PostgreSQL
+#     def quote_column_name(name)
+#       if name.is_a?(Array)
+#         name.collect { |n| %("#{n.to_s.gsub("\"", "\"\"")}") }.join(',')
+#       else
+#         %("#{name.to_s.gsub("\"", "\"\"")}")
+#       end
+#     end
+#   end
+# end
+# ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key"
diff --git a/config/initializers/squeel.rb b/config/initializers/squeel.rb
index aa3f2ff02..821e72952 100644
--- a/config/initializers/squeel.rb
+++ b/config/initializers/squeel.rb
@@ -1,12 +1,24 @@
 Squeel.configure do |config|
   # To load hash extensions (to allow for AND (&), OR (|), and NOT (-) against
-  # hashes of conditions)
+  # hashes of conditions):
+  #
   config.load_core_extensions :hash
 
   # To load symbol extensions (for a subset of the old MetaWhere functionality,
-  # via ARel predicate methods on Symbols: :name.matches, etc)
+  # via Arel predicate methods on Symbols: :name.matches, etc):
+  #
+  # NOTE: Not recommended. Learn the new DSL. Use it. Love it.
+  #
   # config.load_core_extensions :symbol
 
-  # To load both hash and symbol extensions
+  # To load both hash and symbol extensions:
+  #
   # config.load_core_extensions :hash, :symbol
+
+  # Alias an existing predicate to a new name. Use the non-grouped
+  # name -- the any/all variants will also be created. For example,
+  # to alias the standard "lt" predicate to "less_than", and gain
+  # "less_than_any" and "less_than_all" as well:
+  #
+  # config.alias_predicate :less_than, :lt
 end
diff --git a/config/routes.rb b/config/routes.rb
index 67eb757ae..c48feaa5b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,25 +7,13 @@ ChouetteIhm::Application.routes.draw do
 
   devise_scope :user do
     authenticated :user do
-      root :to => 'referentials#index'
+      root :to => 'referentials#index', as: :authenticated_root
     end
-
-    unauthenticated do
-      root :to => 'devise/sessions#new'
+    unauthenticated :user do
+      root :to => 'devise/registrations#new', as: :unauthenticated_root
     end
   end
 
-  # Rails 4 syntax
-  # devise_for :users
-  # devise_scope :user do
-  #   authenticated :user do
-  #     root :to => 'referentials#index', as: :authenticated_root
-  #   end
-  # unauthenticated :user do
-  #     root :to => 'devise/registrations#new', as: :unauthenticated_root
-  #   end
-  # end
-
 
   namespace :api do
     namespace :v1 do
@@ -62,7 +50,7 @@ ChouetteIhm::Application.routes.draw do
     resources :api_keys
     resources :rule_parameter_sets
     resources :autocomplete_stop_areas
-    match 'lines' => 'lines#destroy_all', :via => :delete
+    get 'lines' => 'lines#destroy_all', :via => :delete
     resources :group_of_lines do
       collection do
         get :name_filter
@@ -166,10 +154,10 @@ ChouetteIhm::Application.routes.draw do
 
   end
 
-  match '/help/(*slug)' => 'help#show'
+  get '/help/(*slug)' => 'help#show'
 
-  match '/404', :to => 'errors#not_found'
-  match '/422', :to => 'errors#server_error'
-  match '/500', :to => 'errors#server_error'
+  get '/404', :to => 'errors#not_found'
+  get '/422', :to => 'errors#server_error'
+  get '/500', :to => 'errors#server_error'
 
 end
diff --git a/spec/controllers/api/v1/lines_controller_spec.rb b/spec/controllers/api/v1/lines_controller_spec.rb
index 1d9383593..d57eed766 100644
--- a/spec/controllers/api/v1/lines_controller_spec.rb
+++ b/spec/controllers/api/v1/lines_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::V1::LinesController do
+describe Api::V1::LinesController, :type => :controller do
   let!(:line) { referential.lines.first || create(:line) }
 
   it_behaves_like "api key protected controller" do
@@ -14,7 +14,7 @@ describe Api::V1::LinesController do
       end
 
       it "should assign expected lines" do
-        assigns[:lines].should == [line]
+        expect(assigns[:lines]).to eq([line])
       end
     end
   end
diff --git a/spec/controllers/api/v1/networks_controller_spec.rb b/spec/controllers/api/v1/networks_controller_spec.rb
index 01e3ee35d..1872625ca 100644
--- a/spec/controllers/api/v1/networks_controller_spec.rb
+++ b/spec/controllers/api/v1/networks_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::V1::NetworksController do
+describe Api::V1::NetworksController, :type => :controller do
   let!(:network) { referential.networks.first || create(:network) }
 
   it_behaves_like "api key protected controller" do
@@ -15,7 +15,7 @@ describe Api::V1::NetworksController do
       end
 
       it "should assign expected network" do
-        assigns[:network].should == network
+        expect(assigns[:network]).to eq(network)
       end
     end
   end
@@ -27,7 +27,7 @@ describe Api::V1::NetworksController do
       end
 
       it "should assign expected networks" do
-        assigns[:networks].should == [network]
+        expect(assigns[:networks]).to eq([network])
       end
     end
   end
diff --git a/spec/controllers/api/v1/stop_area_controller_spec.rb b/spec/controllers/api/v1/stop_area_controller_spec.rb
index 8f1b47078..eb0c87661 100644
--- a/spec/controllers/api/v1/stop_area_controller_spec.rb
+++ b/spec/controllers/api/v1/stop_area_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::V1::StopAreasController do
+describe Api::V1::StopAreasController, :type => :controller do
     let!(:stop_area) { referential.stop_areas.first || create(:stop_area) }
 
     it_behaves_like "api key protected controller" do
@@ -14,7 +14,7 @@ describe Api::V1::StopAreasController do
       get :index, :route_id => route.objectid, :line_id => route.line.objectid
     end
     it "should assign expected stop_areas" do
-      assigns[:stop_areas].map(&:id).sort.should == route.stop_areas.map(&:id).sort
+      expect(assigns[:stop_areas].map(&:id).sort).to eq(route.stop_areas.map(&:id).sort)
     end
   end
   describe "GET #index, :q => { :name_cont => 'aa'}" do
@@ -26,7 +26,7 @@ describe Api::V1::StopAreasController do
       get :index, :q => { :name_cont => "aa"} 
     end
     it "should assign expected stop_areas" do
-      assigns[:stop_areas].map(&:name).sort.should == [ sa1.name, sa2.name]
+      expect(assigns[:stop_areas].map(&:name).sort).to eq([ sa1.name, sa2.name])
     end
   end
 end
diff --git a/spec/controllers/exports_controller_spec.rb b/spec/controllers/exports_controller_spec.rb
index fd7b182d7..6cd6e4c54 100644
--- a/spec/controllers/exports_controller_spec.rb
+++ b/spec/controllers/exports_controller_spec.rb
@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe ExportsController do
+describe ExportsController, :type => :controller do
   login_user
 
   describe "GET 'new'" do
     it "returns http success" do
       pending
       get 'new'
-      response.should be_success
+      expect(response).to be_success
     end
   end
 
@@ -15,7 +15,7 @@ describe ExportsController do
     it "returns http success" do
       pending
       get 'index'
-      response.should be_success
+      expect(response).to be_success
     end
   end
 
diff --git a/spec/controllers/import_tasks_controller_spec.rb b/spec/controllers/import_tasks_controller_spec.rb
index d9b8b7660..68b3e0eb2 100644
--- a/spec/controllers/import_tasks_controller_spec.rb
+++ b/spec/controllers/import_tasks_controller_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ImportTasksController do
+describe ImportTasksController, :type => :controller do
   login_user
   shared_examples_for "referential dependant" do
     it "assigns referential as @referential" do
-      assigns[:referential].should == referential
+      expect(assigns[:referential]).to eq(referential)
     end
   end
 
@@ -15,19 +15,19 @@ describe ImportTasksController do
     end
     it_behaves_like "referential dependant"
     it "should assign import_task with NeptuneImport instance" do
-      assigns[:import_task].class.should == NeptuneImport
+      expect(assigns[:import_task].class).to eq(NeptuneImport)
     end
     it "should assign import_task with Neptune format" do
-      assigns[:import_task].format.should == ImportTask.new.format
+      expect(assigns[:import_task].format).to eq(ImportTask.new.format)
     end
     it "should assign import_task with refrential.id" do
-      assigns[:import_task].referential_id.should == referential.id
+      expect(assigns[:import_task].referential_id).to eq(referential.id)
     end
     it "should assign import_task with logged in user id" do
-      assigns[:import_task].user_id.should == referential.organisation.users.first.id
+      expect(assigns[:import_task].user_id).to eq(referential.organisation.users.first.id)
     end
     it "should assign import_task with logged in user name" do
-      assigns[:import_task].user_name.should == referential.organisation.users.first.name
+      expect(assigns[:import_task].user_name).to eq(referential.organisation.users.first.name)
     end
   end
 
diff --git a/spec/controllers/referentials_controller_spec.rb b/spec/controllers/referentials_controller_spec.rb
index 0bed2b21d..442a10bbd 100644
--- a/spec/controllers/referentials_controller_spec.rb
+++ b/spec/controllers/referentials_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ReferentialsController do
+describe ReferentialsController, :type => :controller do
 
   login_user
 
diff --git a/spec/controllers/routes_controller_spec.rb b/spec/controllers/routes_controller_spec.rb
index cfadc382a..83505effe 100644
--- a/spec/controllers/routes_controller_spec.rb
+++ b/spec/controllers/routes_controller_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe RoutesController do
+describe RoutesController, :type => :controller do
   login_user
 
   let!(:route) { Factory(:route) }
 
-  it { should be_kind_of(ChouetteController) }
+  it { is_expected.to be_kind_of(ChouetteController) }
 
   shared_examples_for "redirected to referential_line_path(referential,line)" do
     it "should redirect_to referential_line_path(referential,line)" do
@@ -14,16 +14,16 @@ describe RoutesController do
   end
   shared_examples_for "line and referential linked" do
     it "assigns route.line as @line" do
-      assigns[:line].should == route.line
+      expect(assigns[:line]).to eq(route.line)
     end
 
     it "assigns referential as @referential" do
-      assigns[:referential].should == referential
+      expect(assigns[:referential]).to eq(referential)
     end
   end
   shared_examples_for "route, line and referential linked" do
     it "assigns route as @route" do
-      assigns[:route].should == route
+      expect(assigns[:route]).to eq(route)
     end
     it_behaves_like "line and referential linked"
   end
@@ -68,12 +68,12 @@ describe RoutesController do
     it_behaves_like "route, line and referential linked"
 
     it "assigns RouteMap.new(route) as @map" do
-      assigns[:map].should be_an_instance_of(RouteMap)
-      assigns[:map].route.should == route
+      expect(assigns[:map]).to be_an_instance_of(RouteMap)
+      expect(assigns[:map].route).to eq(route)
     end
 
     it "assigns route.stop_points.paginate(:page => nil) as @stop_points" do
-      assigns[:stop_points].should == route.stop_points.paginate(:page => nil)
+      expect(assigns[:stop_points]).to eq(route.stop_points.paginate(:page => nil))
     end
 
   end
diff --git a/spec/controllers/rule_parameter_sets_controller_spec.rb b/spec/controllers/rule_parameter_sets_controller_spec.rb
index 99a522581..8615183c1 100644
--- a/spec/controllers/rule_parameter_sets_controller_spec.rb
+++ b/spec/controllers/rule_parameter_sets_controller_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe RuleParameterSetsController do
+describe RuleParameterSetsController, :type => :controller do
   login_user
   let(:mode){"air"}
 
   shared_examples_for "referential dependant" do
     it "assigns referential as @referential" do
-      assigns[:referential].should == referential
+      expect(assigns[:referential]).to eq(referential)
     end
   end
 
@@ -26,9 +26,9 @@ describe RuleParameterSetsController do
     it_behaves_like "referential dependant"
     it "should assign rule_parameter_set with default params" do
       RuleParameterSet.default_params.each do |k,v|
-        assigns[:rule_parameter_set].send( k ).should == v
+        expect(assigns[:rule_parameter_set].send( k )).to eq(v)
       end
-      assigns[:rule_parameter_set].referential_id.should == referential.id
+      expect(assigns[:rule_parameter_set].referential_id).to eq(referential.id)
     end
   end
 end
diff --git a/spec/controllers/vehicle_journey_imports_controller_spec.rb b/spec/controllers/vehicle_journey_imports_controller_spec.rb
index 091826205..d91814669 100644
--- a/spec/controllers/vehicle_journey_imports_controller_spec.rb
+++ b/spec/controllers/vehicle_journey_imports_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ImportTasksController do
+describe ImportTasksController, :type => :controller do
   login_user
 
   
diff --git a/spec/exporters/chouette/kml/exporter_spec.rb b/spec/exporters/chouette/kml/exporter_spec.rb
index a996b0746..843b2d2af 100644
--- a/spec/exporters/chouette/kml/exporter_spec.rb
+++ b/spec/exporters/chouette/kml/exporter_spec.rb
@@ -27,26 +27,26 @@ describe Chouette::Kml::Exporter do
 
     it "should return a zip file with nothing inside with no objects in arguments" do
       subject.export(zip_file_path, {:export_id => 1, :o => "line"} )
-      File.exists?(zip_file_path).should be_true
-      ::Zip::File.open(zip_file_path).size.should == 6
+      expect(File.exists?(zip_file_path)).to be_truthy
+      expect(::Zip::File.open(zip_file_path).size).to eq(6)
     end
 
     it "should return a zip file with 4 kml files" do
       subject.export(zip_file_path, {:export_id => 1, :o => "line", :id => "#{line.id}" } )
-      File.exists?(zip_file_path).should be_true
-      ::Zip::File.open(zip_file_path).size.should == 4
+      expect(File.exists?(zip_file_path)).to be_truthy
+      expect(::Zip::File.open(zip_file_path).size).to eq(4)
     end
 
     it "should return a zip file with 6 kml files" do
       subject.export(zip_file_path, {:export_id => 1, :o => "line", :id => "#{line.id},#{line2.id}" } )
-      File.exists?(zip_file_path).should be_true
-      ::Zip::File.open(zip_file_path).size.should == 6
+      expect(File.exists?(zip_file_path)).to be_truthy
+      expect(::Zip::File.open(zip_file_path).size).to eq(6)
     end
 
     it "should return a zip file with 6 kml files" do
       subject.export(zip_file_path, {:export_id => 1, :o => "", :id => "" } )
-      File.exists?(zip_file_path).should be_true
-      ::Zip::File.open(zip_file_path).size.should == 6
+      expect(File.exists?(zip_file_path)).to be_truthy
+      expect(::Zip::File.open(zip_file_path).size).to eq(6)
     end
 
    end
diff --git a/spec/requests/companies_spec.rb b/spec/features/companies_spec.rb
index fdcff4cab..bcf73b631 100644
--- a/spec/requests/companies_spec.rb
+++ b/spec/features/companies_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "Companies" do
+describe "Companies", :type => :feature do
   login_user
 
   let!(:companies) { Array.new(2) { create :company } }
@@ -9,9 +9,10 @@ describe "Companies" do
 
   describe "list" do
     it "display companies" do
+      puts referential.inspect
       visit referential_companies_path(referential)
-      page.should have_content(companies.first.name)
-      page.should have_content(companies.last.name)
+      expect(page).to have_content(companies.first.name)
+      expect(page).to have_content(companies.last.name)
     end
     
   end 
@@ -20,7 +21,7 @@ describe "Companies" do
     it "display company" do
       visit referential_companies_path(referential)
       click_link "#{companies.first.name}"
-      page.should have_content(companies.first.name)
+      expect(page).to have_content(companies.first.name)
     end
     
   end
@@ -29,11 +30,11 @@ describe "Companies" do
     it "creates company and return to show" do
       visit referential_companies_path(referential)
       click_link "Ajouter un transporteur"
-      fill_in "Nom", :with => "Company 1"
+      fill_in "company_name", :with => "Company 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:Company:1"        
       click_button("Créer transporteur")
-      page.should have_content("Company 1")
+      expect(page).to have_content("Company 1")
     end
   end
 
@@ -44,7 +45,7 @@ describe "Companies" do
       fill_in "Nom", :with => "Company Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       click_button("Modifier transporteur")
-      page.should have_content("Company Modified")
+      expect(page).to have_content("Company Modified")
     end
   end
 
diff --git a/spec/requests/connection_links_spec.rb b/spec/features/connection_links_spec.rb
index 74fe17c2e..985aba7a6 100644
--- a/spec/requests/connection_links_spec.rb
+++ b/spec/features/connection_links_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "ConnectionLinks" do
+describe "ConnectionLinks", :type => :feature do
   login_user
 
   let!(:connection_links) { Array.new(2) { create(:connection_link) } }
@@ -10,8 +10,8 @@ describe "ConnectionLinks" do
   describe "list" do
     it "display connection_links" do
       visit referential_connection_links_path(referential)
-      page.should have_content(connection_links.first.name)
-      page.should have_content(connection_links.last.name)
+      expect(page).to have_content(connection_links.first.name)
+      expect(page).to have_content(connection_links.last.name)
     end
     
   end 
@@ -20,14 +20,14 @@ describe "ConnectionLinks" do
     it "display connection_link" do
       visit referential_connection_links_path(referential)
       click_link "#{connection_links.first.name}"
-      page.should have_content(connection_links.first.name)
+      expect(page).to have_content(connection_links.first.name)
     end
     
     it "display map" do
-      subject.stub(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
+      allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_connection_links_path(referential)
       click_link "#{connection_links.first.name}"
-      page.should have_selector("#map", :class => 'connection_link')
+      expect(page).to have_selector("#map", :class => 'connection_link')
     end
     
   end
@@ -39,7 +39,7 @@ describe "ConnectionLinks" do
       fill_in "Nom", :with => "ConnectionLink 1"
       fill_in "Identifiant Neptune", :with => "test:ConnectionLink:1"        
       click_button("Créer correspondance")
-      page.should have_content("ConnectionLink 1")
+      expect(page).to have_content("ConnectionLink 1")
     end
   end
 
@@ -49,7 +49,7 @@ describe "ConnectionLinks" do
       click_link "Modifier cette correspondance"
       fill_in "Nom", :with => "ConnectionLink Modified"
       click_button("Modifier correspondance")
-      page.should have_content("ConnectionLink Modified")
+      expect(page).to have_content("ConnectionLink Modified")
     end
   end
 
diff --git a/spec/requests/journey_pattern_spec.rb b/spec/features/journey_pattern_spec.rb
index d5afcfbf0..f57bf2952 100644
--- a/spec/requests/journey_pattern_spec.rb
+++ b/spec/features/journey_pattern_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "JourneyPatterns" do
+describe "JourneyPatterns", :type => :feature do
   login_user
 
   let(:line) { Factory(:line) }
@@ -12,7 +12,7 @@ describe "JourneyPatterns" do
     it "display route's journey_patterns" do
       pending
       visit referential_line_route_path(referential,line,route)
-      page.should have_content(journey_pattern.name)
+      expect(page).to have_content(journey_pattern.name)
     end
   end
   describe "from route's page to journey_pattern's page" do
@@ -20,9 +20,9 @@ describe "JourneyPatterns" do
       pending
       visit referential_line_route_path(referential,line,route)
       click_link "#{journey_pattern.name}"
-      page.should have_content(journey_pattern.published_name)
-      page.should have_content(journey_pattern.comment)
-      page.should have_content(journey_pattern.registration_number)
+      expect(page).to have_content(journey_pattern.published_name)
+      expect(page).to have_content(journey_pattern.comment)
+      expect(page).to have_content(journey_pattern.registration_number)
     end
   end
   describe "from route's page, create a new journey_pattern" do      
@@ -33,7 +33,7 @@ describe "JourneyPatterns" do
       fill_in "Nom", :with => "A to B"
       fill_in "Comment", :with => "AB"
       click_button("Créer mission")
-      page.should have_content("A to B")
+      expect(page).to have_content("A to B")
     end
   end
   describe "from route's page, select a journey_pattern and edit it" do      
@@ -44,7 +44,7 @@ describe "JourneyPatterns" do
       click_link "Modifier cette mission"
       fill_in "Nom", :with => "#{journey_pattern.name}-changed"
       click_button("Modifier mission")
-      page.should have_content("#{journey_pattern.name}-changed")
+      expect(page).to have_content("#{journey_pattern.name}-changed")
     end
   end
   describe "from route's page, select a journey_pattern and delete it" do      
@@ -53,7 +53,7 @@ describe "JourneyPatterns" do
       visit referential_line_route_path(referential,line,route)
       click_link "#{journey_pattern.name}"
       click_link "Supprimer cette mission"
-      page.should_not have_content(journey_pattern.name)
+      expect(page).not_to have_content(journey_pattern.name)
     end
   end
 end
diff --git a/spec/requests/lines_spec.rb b/spec/features/lines_spec.rb
index b851f522a..4023c1f51 100644
--- a/spec/requests/lines_spec.rb
+++ b/spec/features/lines_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "Lines" do
+describe "Lines", :type => :feature do
   login_user
 
   let!(:network) { Factory(:network) }
@@ -12,8 +12,8 @@ describe "Lines" do
   describe "list" do
     it "display lines" do
       visit referential_lines_path(referential)
-      page.should have_content(lines.first.name)
-      page.should have_content(lines.last.name)
+      expect(page).to have_content(lines.first.name)
+      expect(page).to have_content(lines.last.name)
     end
     
   end
@@ -23,13 +23,13 @@ describe "Lines" do
     it "display line" do
       visit referential_lines_path(referential)
       click_link "#{lines.first.name}"
-      page.should have_content(lines.first.name)
+      expect(page).to have_content(lines.first.name)
     end
 
     it "display map" do
       visit referential_lines_path(referential)
       click_link "#{lines.first.name}"
-      page.should have_selector("#map", :class => 'line')
+      expect(page).to have_selector("#map", :class => 'line')
     end
     
   end
@@ -42,7 +42,7 @@ describe "Lines" do
       fill_in "Numéro d'enregistrement", :with => "1"
       fill_in "Identifiant Neptune", :with => "test:Line:999"        
       click_button("Créer ligne")
-      page.should have_content("Line 1")
+      expect(page).to have_content("Line 1")
     end
   end
 
@@ -53,7 +53,7 @@ describe "Lines" do
       fill_in "Nom", :with => "Line Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       click_button("Modifier ligne")
-      page.should have_content("Line Modified")
+      expect(page).to have_content("Line Modified")
     end
   end
 
diff --git a/spec/requests/networks_spec.rb b/spec/features/networks_spec.rb
index 662e5e830..3bfb63ffd 100644
--- a/spec/requests/networks_spec.rb
+++ b/spec/features/networks_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "Networks" do
+describe "Networks", :type => :feature do
   login_user
 
   let!(:networks) { Array.new(2) { Factory(:network) } }
@@ -10,51 +10,51 @@ describe "Networks" do
   describe "list" do
     it "display networks" do
       visit referential_networks_path(referential)
-      page.should have_content(networks.first.name)
-      page.should have_content(networks.last.name)
+      expect(page).to have_content(networks.first.name)
+      expect(page).to have_content(networks.last.name)
     end
     
   end 
 
   describe "show" do      
     it "display network" do
-      subject.stub(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
+      allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_networks_path(referential)
       click_link "#{networks.first.name}"
-      page.should have_content(networks.first.name)
+      expect(page).to have_content(networks.first.name)
     end
 
     it "display map" do
-      subject.stub(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
+      allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_networks_path(referential)
       click_link "#{networks.first.name}"
-      page.should have_selector("#map", :class => 'network')
+      expect(page).to have_selector("#map", :class => 'network')
     end
     
   end
 
   describe "new" do      
     it "creates network and return to show" do
-      subject.stub(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
+      allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_networks_path(referential)
       click_link "Ajouter un réseau"
       fill_in "Nom", :with => "Network 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:GroupOfLine:1"        
       click_button("Créer réseau")
-      page.should have_content("Network 1")
+      expect(page).to have_content("Network 1")
     end
   end
 
   describe "edit and return to show" do      
     it "edit network" do
-      subject.stub(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
+      allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_network_path(referential, subject)
       click_link "Modifier ce réseau"
       fill_in "Nom", :with => "Network Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       click_button("Modifier réseau")
-      page.should have_content("Network Modified")
+      expect(page).to have_content("Network Modified")
     end
   end
 
diff --git a/spec/requests/referentials_spec.rb b/spec/features/referentials_spec.rb
index 975248375..d4a21479f 100644
--- a/spec/requests/referentials_spec.rb
+++ b/spec/features/referentials_spec.rb
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "Referentials" do
+describe "Referentials", :type => :feature do
   login_user
 
   describe "index" do
 
     it "should support no referential" do
       visit referentials_path
-      page.should have_content("Espaces de Données")
+      expect(page).to have_content("Espaces de Données")
     end
 
     context "when several referentials exist" do
@@ -23,8 +23,8 @@ describe "Referentials" do
 
       it "should show n referentials" do
         visit referentials_path
-        page.should have_content(referentials.first.name)
-        page.should have_content(referentials.last.name)
+        expect(page).to have_content(referentials.first.name)
+        expect(page).to have_content(referentials.last.name)
       end
       
     end
@@ -41,7 +41,7 @@ describe "Referentials" do
       fill_in "Point bas/gauche de l'emprise par défaut", :with => "1.0, 1.0"
       click_button "Créer Espace de Données"
 
-      Referential.where(:name => "Test").should_not be_nil
+      expect(Referential.where(:name => "Test")).not_to be_nil
       # CREATE SCHEMA
     end
 
@@ -54,7 +54,7 @@ describe "Referentials" do
       pending "Unauthorized DELETE (ticket #14)"
       visit referential_path(referential)
       click_link "Supprimer"
-      Referential.where(:slug => referential.slug).should be_blank
+      expect(Referential.where(:slug => referential.slug)).to be_blank
     end
 
   end
diff --git a/spec/requests/routes_spec.rb b/spec/features/routes_spec.rb
index 5e24b8492..da4120309 100644
--- a/spec/requests/routes_spec.rb
+++ b/spec/features/routes_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "Routes" do
+describe "Routes", :type => :feature do
   login_user
 
   let!(:line) { Factory(:line) }
@@ -13,8 +13,8 @@ describe "Routes" do
       pending
       visit referential_lines_path(referential)
       click_link "#{line.name}"
-      page.should have_content(route.name)
-      page.should have_content(route2.name)
+      expect(page).to have_content(route.name)
+      expect(page).to have_content(route2.name)
     end
   end
   describe "from line's page to route's page" do
@@ -22,8 +22,8 @@ describe "Routes" do
       pending
       visit referential_line_path(referential,line)
       click_link "#{route.name}"
-      page.should have_content(route.name)
-      page.should have_content(route.number)
+      expect(page).to have_content(route.name)
+      expect(page).to have_content(route.number)
     end
   end
   describe "from line's page, create a new route" do      
@@ -34,7 +34,7 @@ describe "Routes" do
       fill_in "Nom", :with => "A to B"
       fill_in "Indice", :with => "AB"
       click_button("Créer Séquence d'arrêts")
-      page.should have_content("A to B")
+      expect(page).to have_content("A to B")
     end
   end
   describe "from line's page, select a route and edit it" do      
@@ -45,7 +45,7 @@ describe "Routes" do
       click_link "Modifier cette séquence d'arrêts"
       fill_in "Nom", :with => "#{route.name}-changed"
       click_button("Modifier Séquence d'arrêts")
-      page.should have_content("#{route.name}-changed")
+      expect(page).to have_content("#{route.name}-changed")
     end
   end
   describe "from line's page, select a route and delete it" do      
diff --git a/spec/requests/stop_areas_spec.rb b/spec/features/stop_areas_spec.rb
index ef3ca9275..4d1b7e2bb 100644
--- a/spec/requests/stop_areas_spec.rb
+++ b/spec/features/stop_areas_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "StopAreas" do
+describe "StopAreas", :type => :feature do
   login_user
 
   let!(:stop_areas) { Array.new(2) { Factory(:stop_area) } }
@@ -10,8 +10,8 @@ describe "StopAreas" do
   describe "list" do
     it "display stop_areas" do
       visit referential_stop_areas_path(referential)
-      page.should have_content(stop_areas.first.name)
-      page.should have_content(stop_areas.last.name)
+      expect(page).to have_content(stop_areas.first.name)
+      expect(page).to have_content(stop_areas.last.name)
     end    
   end
 
@@ -19,13 +19,13 @@ describe "StopAreas" do
     it "display stop_area" do
       visit referential_stop_areas_path(referential)
       click_link "#{stop_areas.first.name}"
-      page.should have_content(stop_areas.first.name)
+      expect(page).to have_content(stop_areas.first.name)
     end
 
     it "display map" do
       visit referential_stop_areas_path(referential)
       click_link "#{stop_areas.first.name}"
-      page.should have_selector("#map", :class => 'stop_area')
+      expect(page).to have_selector("#map", :class => 'stop_area')
     end
     
   end
@@ -38,7 +38,7 @@ describe "StopAreas" do
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:StopArea:1"        
       click_button("Créer arrêt")
-      page.should have_content("StopArea 1")
+      expect(page).to have_content("StopArea 1")
     end
   end
 
@@ -49,7 +49,7 @@ describe "StopAreas" do
       fill_in "Nom", :with => "StopArea Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       click_button("Modifier arrêt")
-      page.should have_content("StopArea Modified")
+      expect(page).to have_content("StopArea Modified")
     end
   end
 
diff --git a/spec/requests/stop_points_spec.rb b/spec/features/stop_points_spec.rb
index 263711497..ec3aca475 100644
--- a/spec/requests/stop_points_spec.rb
+++ b/spec/features/stop_points_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "StopPoints" do
+describe "StopPoints", :type => :feature do
   login_user
 
   let(:line) { Factory(:line) }
@@ -14,7 +14,7 @@ describe "StopPoints" do
       visit referential_line_route_path(referential,line,route)
       click_link "Gérer les arrêts de la séquence"
       route.stop_areas.each do |sa|
-        page.should have_content(sa.name)
+        expect(page).to have_content(sa.name)
       end
     end
   end
@@ -24,7 +24,7 @@ describe "StopPoints" do
       visit referential_line_route_path(referential,line,route)
       click_link "Gérer les arrêts de la séquence"
       click_link "Ajouter un arrêt à la séquence"
-      page.should have_content( "Sélectionner un arrêt")
+      expect(page).to have_content( "Sélectionner un arrêt")
     end
   end
 end
diff --git a/spec/requests/time_tables_spec.rb b/spec/features/time_tables_spec.rb
index fbe03db2b..d9304c5ba 100644
--- a/spec/requests/time_tables_spec.rb
+++ b/spec/features/time_tables_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "TimeTables" do
+describe "TimeTables", :type => :feature do
   login_user
 
   let!(:time_tables) { Array.new(2) { create(:time_table) } }
@@ -10,8 +10,8 @@ describe "TimeTables" do
   describe "list" do
     it "display time_tables" do
       visit referential_time_tables_path(referential)
-      page.should have_content(time_tables.first.comment)
-      page.should have_content(time_tables.last.comment)
+      expect(page).to have_content(time_tables.first.comment)
+      expect(page).to have_content(time_tables.last.comment)
     end
 
   end
@@ -20,7 +20,7 @@ describe "TimeTables" do
     it "display time_table" do
       visit referential_time_tables_path(referential)
       click_link "#{time_tables.first.comment}"
-      page.should have_content(time_tables.first.comment)
+      expect(page).to have_content(time_tables.first.comment)
     end
 
   end
@@ -32,7 +32,7 @@ describe "TimeTables" do
       fill_in "Nom", :with => "TimeTable 1"
       fill_in "Identifiant Neptune", :with => "test:Timetable:1"
       click_button("Créer Calendrier")
-      page.should have_content("TimeTable 1")
+      expect(page).to have_content("TimeTable 1")
     end
   end
 
@@ -42,7 +42,7 @@ describe "TimeTables" do
       click_link "Modifier ce calendrier"
       fill_in "Nom", :with => "TimeTable Modified"
       click_button("Modifier Calendrier")
-      page.should have_content("TimeTable Modified")
+      expect(page).to have_content("TimeTable Modified")
     end
   end
 
diff --git a/spec/requests/vehicle_journey_imports_spec.rb b/spec/features/vehicle_journey_imports_spec.rb
index 68fe04e0b..3df9f1054 100644
--- a/spec/requests/vehicle_journey_imports_spec.rb
+++ b/spec/features/vehicle_journey_imports_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "VehicleJourneyImports" do
+describe "VehicleJourneyImports", :type => :feature do
   login_user
   
   let!(:route) { create :route }
diff --git a/spec/helpers/exports_helper_spec.rb b/spec/helpers/exports_helper_spec.rb
index 33257b1d1..fec8252d5 100644
--- a/spec/helpers/exports_helper_spec.rb
+++ b/spec/helpers/exports_helper_spec.rb
@@ -10,6 +10,6 @@ require 'spec_helper'
 #     end
 #   end
 # end
-describe ExportsHelper do
+describe ExportsHelper, :type => :helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/helpers/help_helper_spec.rb b/spec/helpers/help_helper_spec.rb
index 29709b960..3df091c10 100644
--- a/spec/helpers/help_helper_spec.rb
+++ b/spec/helpers/help_helper_spec.rb
@@ -10,6 +10,6 @@ require 'spec_helper'
 #     end
 #   end
 # end
-describe HelpHelper do
+describe HelpHelper, :type => :helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/helpers/imports_helper_spec.rb b/spec/helpers/imports_helper_spec.rb
index 8e5ec0c86..ec3bb05c5 100644
--- a/spec/helpers/imports_helper_spec.rb
+++ b/spec/helpers/imports_helper_spec.rb
@@ -10,6 +10,6 @@ require 'spec_helper'
 #     end
 #   end
 # end
-describe ImportsHelper do
+describe ImportsHelper, :type => :helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/helpers/referentials_helper_spec.rb b/spec/helpers/referentials_helper_spec.rb
index 883116983..6efc13822 100644
--- a/spec/helpers/referentials_helper_spec.rb
+++ b/spec/helpers/referentials_helper_spec.rb
@@ -10,6 +10,6 @@ require 'spec_helper'
 #     end
 #   end
 # end
-describe ReferentialsHelper do
+describe ReferentialsHelper, :type => :helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/api/v1/api_key_spec.rb b/spec/models/api/v1/api_key_spec.rb
index 02c68ea13..3da11527c 100644
--- a/spec/models/api/v1/api_key_spec.rb
+++ b/spec/models/api/v1/api_key_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Api::V1::ApiKey do
+describe Api::V1::ApiKey, :type => :model do
   let!(:referential){Factory(:referential)}
   subject { Api::V1::ApiKey.create( :name => "test", :referential => referential)}
 
   it "test" do
-    subject.should be_valid
-    subject.referential.should == referential
+    expect(subject).to be_valid
+    expect(subject.referential).to eq(referential)
 
   end
 end
diff --git a/spec/models/compliance_check_result_spec.rb b/spec/models/compliance_check_result_spec.rb
index 4d73d8ad3..42a2e4507 100644
--- a/spec/models/compliance_check_result_spec.rb
+++ b/spec/models/compliance_check_result_spec.rb
@@ -1,68 +1,100 @@
-require 'spec_helper'
-
-describe ComplianceCheckResult do
-
-  subject { Factory( :compliance_check_result)}
-
-  describe "#indice" do
-    context "when 1-NEPTUNE-XML-1 result" do
-      before(:each) do
-        subject.rule_code = "1-NEPTUNE-XML-1"
-      end
-      its(:indice) { should == 1 }
-    end
-    context "when 2-NETEX-AccessLink-2 result" do
-      before(:each) do
-        subject.rule_code = "2-NETEX-AccessLink-2"
-      end
-      its(:indice) { should == 2 }
-    end
-  end
-
-  describe "#data_type" do
-    context "when 1-NEPTUNE-XML-1 result" do
-      before(:each) do
-        subject.rule_code = "1-NEPTUNE-XML-1"
-      end
-      its(:data_type) { should == "XML" }
-    end
-    context "when 2-NETEX-AccessLink-2 result" do
-      before(:each) do
-        subject.rule_code = "2-NETEX-AccessLink-2"
-      end
-      its(:data_type) { should == "AccessLink" }
-    end
-  end
-
-  describe "#format" do
-    context "when 1-NEPTUNE-XML-1 result" do
-      before(:each) do
-        subject.rule_code = "1-NEPTUNE-XML-1"
-      end
-      its(:format) { should == "NEPTUNE" }
-    end
-    context "when 2-NETEX-AccessLink-2 result" do
-      before(:each) do
-        subject.rule_code = "2-NETEX-AccessLink-2"
-      end
-      its(:format) { should == "NETEX" }
-    end
-  end
-
-  describe "#level" do
-    context "when 1-NEPTUNE-XML-1 result" do
-      before(:each) do
-        subject.rule_code = "1-NEPTUNE-XML-1"
-      end
-      its(:level) { should == 1 }
-    end
-    context "when 2-NEPTUNE-AccessLink-2 result" do
-      before(:each) do
-        subject.rule_code = "2-NEPTUNE-AccessLink-2"
-      end
-      its(:level) { should == 2 }
-    end
-  end
-
-end
+# require 'spec_helper'
+
+# describe ComplianceCheckResult, :type => :model do
+
+#   subject { Factory( :compliance_check_result)}
+
+#   describe "#indice" do
+#     context "when 1-NEPTUNE-XML-1 result" do
+#       before(:each) do
+#         subject.rule_code = "1-NEPTUNE-XML-1"
+#       end
+
+#       describe '#indice' do
+#         subject { super().indice }
+#         it { is_expected.to eq(1) }
+#       end
+#     end
+#     context "when 2-NETEX-AccessLink-2 result" do
+#       before(:each) do
+#         subject.rule_code = "2-NETEX-AccessLink-2"
+#       end
+
+#       describe '#indice' do
+#         subject { super().indice }
+#         it { is_expected.to eq(2) }
+#       end
+#     end
+#   end
+
+#   describe "#data_type" do
+#     context "when 1-NEPTUNE-XML-1 result" do
+#       before(:each) do
+#         subject.rule_code = "1-NEPTUNE-XML-1"
+#       end
+
+#       describe '#data_type' do
+#         subject { super().data_type }
+#         it { is_expected.to eq("XML") }
+#       end
+#     end
+#     context "when 2-NETEX-AccessLink-2 result" do
+#       before(:each) do
+#         subject.rule_code = "2-NETEX-AccessLink-2"
+#       end
+
+#       describe '#data_type' do
+#         subject { super().data_type }
+#         it { is_expected.to eq("AccessLink") }
+#       end
+#     end
+#   end
+
+#   describe "#format" do
+#     context "when 1-NEPTUNE-XML-1 result" do
+#       before(:each) do
+#         subject.rule_code = "1-NEPTUNE-XML-1"
+#       end
+
+#       describe '#format' do
+#         subject { super().format }
+#         it { is_expected.to eq("NEPTUNE") }
+#       end
+#     end
+#     context "when 2-NETEX-AccessLink-2 result" do
+#       before(:each) do
+#         subject.rule_code = "2-NETEX-AccessLink-2"
+#       end
+
+#       describe '#format' do
+#         subject { super().format }
+#         it { is_expected.to eq("NETEX") }
+#       end
+#     end
+#   end
+
+#   describe "#level" do
+#     context "when 1-NEPTUNE-XML-1 result" do
+#       before(:each) do
+#         subject.rule_code = "1-NEPTUNE-XML-1"
+#       end
+
+#       describe '#level' do
+#         subject { super().level }
+#         it { is_expected.to eq(1) }
+#       end
+#     end
+#     context "when 2-NEPTUNE-AccessLink-2 result" do
+#       before(:each) do
+#         subject.rule_code = "2-NEPTUNE-AccessLink-2"
+#       end
+
+#       describe '#level' do
+#         subject { super().level }
+#         it { is_expected.to eq(2) }
+#       end
+#     end
+#   end
+
+# end
 
diff --git a/spec/models/compliance_check_task_spec.rb b/spec/models/compliance_check_task_spec.rb
index 475926a7c..2e5379de7 100644
--- a/spec/models/compliance_check_task_spec.rb
+++ b/spec/models/compliance_check_task_spec.rb
@@ -1,314 +1,314 @@
-require 'spec_helper'
+# require 'spec_helper'
 
-describe ComplianceCheckTask do
+# describe ComplianceCheckTask, :type => :model do
 
-  subject { Factory( :compliance_check_task ) }
+#   subject { Factory( :compliance_check_task ) }
 
-  RSpec::Matchers.define :be_log_message do |expected|
-    match do |actual|
-      actual and expected.all? { |k,v| actual[k.to_s] == v }
-    end
-  end
+#   RSpec::Matchers.define :be_log_message do |expected|
+#     match do |actual|
+#       actual and expected.all? { |k,v| actual[k.to_s] == v }
+#     end
+#   end
 
 
-  describe "#any_error_severity_failure?" do
-    context "when compliance_check_results empty" do
-      before(:each) do
-        subject.compliance_check_results = []
-      end
-      it "does return false" do
-        subject.any_error_severity_failure?.should be_false
-      end
-    end
-    context "when compliance_check_results contains a error_severity_failure" do
-      let( :valid_result){ Factory.build( :compliance_check_result) }
-      let( :invalid_result){ Factory.build( :compliance_check_result, :severity => "error", :status => "nok") }
-      before(:each) do
-        subject.compliance_check_results = [ valid_result, invalid_result]
-      end
-      it "does return true" do
-        subject.any_error_severity_failure?.should be_true
-      end
-    end
-    context "when compliance_check_results contains no error_severity_failure" do
-      let( :valid_result){ Factory.build( :compliance_check_result) }
-      before(:each) do
-        subject.compliance_check_results = [ valid_result]
-      end
-      it "does return false" do
-        subject.any_error_severity_failure?.should be_false
-      end
-    end
-  end
+#   describe "#any_error_severity_failure?" do
+#     context "when compliance_check_results empty" do
+#       before(:each) do
+#         subject.compliance_check_results = []
+#       end
+#       it "does return false" do
+#         expect(subject.any_error_severity_failure?).to be_falsey
+#       end
+#     end
+#     context "when compliance_check_results contains a error_severity_failure" do
+#       let( :valid_result){ Factory.build( :compliance_check_result) }
+#       let( :invalid_result){ Factory.build( :compliance_check_result, :severity => "error", :status => "nok") }
+#       before(:each) do
+#         subject.compliance_check_results = [ valid_result, invalid_result]
+#       end
+#       it "does return true" do
+#         expect(subject.any_error_severity_failure?).to be_truthy
+#       end
+#     end
+#     context "when compliance_check_results contains no error_severity_failure" do
+#       let( :valid_result){ Factory.build( :compliance_check_result) }
+#       before(:each) do
+#         subject.compliance_check_results = [ valid_result]
+#       end
+#       it "does return false" do
+#         expect(subject.any_error_severity_failure?).to be_falsey
+#       end
+#     end
+#   end
 
-  describe "#destroy" do
-    let(:import_task){ Factory( :import_task )}
-    context "with an import_task" do
-        before(:each) do
-          subject.import_task = import_task
-        end
-        it "should destroy import_task" do
-          subject.destroy
-          ImportTask.exists?( import_task.id).should be_false
-        end
-    end
-    context "without any import_task" do
-        before(:each) do
-          subject.import_task = nil
-        end
-        it "should not raise exception" do
-          subject.destroy
-          subject.should be_destroyed
-        end
-    end
-  end
+#   describe "#destroy" do
+#     let(:import_task){ Factory( :import_task )}
+#     context "with an import_task" do
+#         before(:each) do
+#           subject.import_task = import_task
+#         end
+#         it "should destroy import_task" do
+#           subject.destroy
+#           expect(ImportTask.exists?( import_task.id)).to be_falsey
+#         end
+#     end
+#     context "without any import_task" do
+#         before(:each) do
+#           subject.import_task = nil
+#         end
+#         it "should not raise exception" do
+#           subject.destroy
+#           expect(subject).to be_destroyed
+#         end
+#     end
+#   end
 
-  describe "#levels" do
-    let(:import_task){ Factory( :import_task )}
-    context "when validation is without import" do
-      it "should not return levels 1 and 2" do
-        subject.levels.include?(1).should be_false
-        subject.levels.include?(2).should be_false
-      end
-      context "when parameter_set is defined" do
-        before(:each) do
-          subject.parameter_set = "dummy"
-        end
-        it "should return level 3" do
-          subject.levels.include?(3).should be_true
-        end
-      end
-      context "when parameter_set is not defined" do
-        before(:each) do
-          subject.parameter_set = nil
-        end
-        it "should not return level 3" do
-          subject.levels.include?(3).should_not be_true
-        end
-      end
-    end
-    context "when validation is done with an import" do
-      before(:each) do
-        subject.import_task = import_task
-      end
-      it "should return levels 1 and 2" do
-        subject.levels.include?(1).should be_true
-        subject.levels.include?(2).should be_true
-      end
-      context "when parameter_set is defined" do
-        before(:each) do
-          subject.parameter_set = "dummy"
-        end
-        it "should return level 3" do
-          subject.levels.include?(3).should be_true
-        end
-      end
-      context "when parameter_set is not defined" do
-        before(:each) do
-          subject.parameter_set = nil
-        end
-        it "should not return level 3" do
-          subject.levels.include?(3).should_not be_true
-        end
-      end
-    end
+#   describe "#levels" do
+#     let(:import_task){ Factory( :import_task )}
+#     context "when validation is without import" do
+#       it "should not return levels 1 and 2" do
+#         expect(subject.levels.include?(1)).to be_falsey
+#         expect(subject.levels.include?(2)).to be_falsey
+#       end
+#       context "when parameter_set is defined" do
+#         before(:each) do
+#           subject.parameter_set = "dummy"
+#         end
+#         it "should return level 3" do
+#           expect(subject.levels.include?(3)).to be_truthy
+#         end
+#       end
+#       context "when parameter_set is not defined" do
+#         before(:each) do
+#           subject.parameter_set = nil
+#         end
+#         it "should not return level 3" do
+#           expect(subject.levels.include?(3)).not_to be_truthy
+#         end
+#       end
+#     end
+#     context "when validation is done with an import" do
+#       before(:each) do
+#         subject.import_task = import_task
+#       end
+#       it "should return levels 1 and 2" do
+#         expect(subject.levels.include?(1)).to be_truthy
+#         expect(subject.levels.include?(2)).to be_truthy
+#       end
+#       context "when parameter_set is defined" do
+#         before(:each) do
+#           subject.parameter_set = "dummy"
+#         end
+#         it "should return level 3" do
+#           expect(subject.levels.include?(3)).to be_truthy
+#         end
+#       end
+#       context "when parameter_set is not defined" do
+#         before(:each) do
+#           subject.parameter_set = nil
+#         end
+#         it "should not return level 3" do
+#           expect(subject.levels.include?(3)).not_to be_truthy
+#         end
+#       end
+#     end
 
-  end
+#   end
 
-  describe "#chouette_command" do
-    it "should be a Chouette::Command instance" do
-      subject.send( :chouette_command).class.should == Chouette::Command
-    end
-    it "should have schema same as referential.slug" do
-      subject.send( :chouette_command).schema.should == subject.referential.slug
-    end
-  end
+#   describe "#chouette_command" do
+#     it "should be a Chouette::Command instance" do
+#       expect(subject.send( :chouette_command).class).to eq(Chouette::Command)
+#     end
+#     it "should have schema same as referential.slug" do
+#       expect(subject.send( :chouette_command).schema).to eq(subject.referential.slug)
+#     end
+#   end
 
-  describe "#validate" do
-    let(:compliance_check_task){ Factory(:compliance_check_task) }
-    let(:chouette_command) { "dummy" }
-    context "for failing validation" do
-      before(:each) do
-        chouette_command.stub!( :run!).and_raise( "dummy")
-        compliance_check_task.stub!( :chouette_command => chouette_command)
-      end
-      it "should have status 'failed'" do
-        compliance_check_task.validate
-        compliance_check_task.status.should == "failed"
-      end
-    end
-    context "for successful validation" do
-      before(:each) do
-        compliance_check_task.stub!( :chouette_command => mock( :run! => true ))
-      end
-      it "should have status 'completed'" do
-        compliance_check_task.validate
-        compliance_check_task.status.should == "completed"
-      end
-    end
-  end
+#   describe "#validate" do
+#     let(:compliance_check_task){ Factory(:compliance_check_task) }
+#     let(:chouette_command) { "dummy" }
+#     context "for failing validation" do
+#       before(:each) do
+#         allow(chouette_command).to receive( :run!).and_raise( "dummy")
+#         allow(compliance_check_task).to receive_messages( :chouette_command => chouette_command)
+#       end
+#       it "should have status 'failed'" do
+#         compliance_check_task.validate
+#         expect(compliance_check_task.status).to eq("failed")
+#       end
+#     end
+#     context "for successful validation" do
+#       before(:each) do
+#         allow(compliance_check_task).to receive_messages( :chouette_command => double( :run! => true ))
+#       end
+#       it "should have status 'completed'" do
+#         compliance_check_task.validate
+#         expect(compliance_check_task.status).to eq("completed")
+#       end
+#     end
+#   end
 
-  describe "#validate" do
-    let(:compliance_check_task){ Factory(:compliance_check_task) }
-    let(:command_args){ "dummy" }
-    before(:each) do
-      compliance_check_task.stub!( :chouette_command => mock( :run! => true ))
-      compliance_check_task.stub!( :chouette_command_args => command_args)
-    end
-    it "should call chouette_command.run! with :c => 'import', :id => id" do
-      compliance_check_task.send( :chouette_command).should_receive( :run! ).with(  command_args)
-      compliance_check_task.validate
-    end
-  end
+#   describe "#validate" do
+#     let(:compliance_check_task){ Factory(:compliance_check_task) }
+#     let(:command_args){ "dummy" }
+#     before(:each) do
+#       allow(compliance_check_task).to receive_messages( :chouette_command => double( :run! => true ))
+#       allow(compliance_check_task).to receive_messages( :chouette_command_args => command_args)
+#     end
+#     it "should call chouette_command.run! with :c => 'import', :id => id" do
+#       expect(compliance_check_task.send( :chouette_command)).to receive( :run! ).with(  command_args)
+#       compliance_check_task.validate
+#     end
+#   end
 
-  describe "#delayed_validate" do
-    let( :import_task){ Factory.build(:import_task) }
-    before(:each) do
-      subject.stub!( :delay => mock( :validate => true))
-    end
-    it "should not call delay#validate if import_task defined" do
-      subject.import_task = import_task
-      subject.delay.should_not_receive( :validate)
-      subject.delayed_validate
-    end
-    it "should call delay#validate if import_task blank" do
-      subject.import_task = nil
-      subject.delay.should_receive( :validate)
-      subject.delayed_validate
-    end
+#   describe "#delayed_validate" do
+#     let( :import_task){ Factory.build(:import_task) }
+#     before(:each) do
+#       allow(subject).to receive_messages( :delay => double( :validate => true))
+#     end
+#     it "should not call delay#validate if import_task defined" do
+#       subject.import_task = import_task
+#       expect(subject.delay).not_to receive( :validate)
+#       subject.delayed_validate
+#     end
+#     it "should call delay#validate if import_task blank" do
+#       subject.import_task = nil
+#       expect(subject.delay).to receive( :validate)
+#       subject.delayed_validate
+#     end
 
-  end
+#   end
 
-  describe "#define_default_attributes" do
-    it "should keep status if defined" do
-      subject.status = "dummy"
-      subject.define_default_attributes
-      subject.status.should == "dummy"
-    end
-    it "should set status to pending if not defined" do
-      subject.status = nil
-      subject.define_default_attributes
-      subject.status.should == "pending"
-    end
-    context "when rule_parameter_set is nil" do
-      before(:each) do
-        subject.stub!( :rule_parameter_set => nil)
-        subject.parameter_set = "dummy"
-        subject.parameter_set_name = "dummy"
-      end
-      it "should keep parameter_set_name" do
-        subject.define_default_attributes
-        subject.parameter_set_name.should == "dummy"
-      end
-      it "should keep parameter_set" do
-        subject.define_default_attributes
-        subject.parameter_set.should == "dummy"
-      end
-    end
-    context "when rule_parameter_set is defined" do
-      let( :rule_parameter_set ){ Factory( :rule_parameter_set ) }
-      before(:each) do
-        subject.stub!( :rule_parameter_set => rule_parameter_set)
-        subject.parameter_set = "dummy"
-        subject.parameter_set_name = "dummy"
-      end
-      it "should set parameter_set_name to rule_parameter_set.name" do
-        subject.define_default_attributes
-        subject.parameter_set_name.should == rule_parameter_set.name
-      end
-      it "should keep set parameter_set to rule_parameter_set.parameters" do
-        subject.define_default_attributes
-        subject.parameter_set.should == rule_parameter_set.parameters
-      end
-    end
-  end
+#   describe "#define_default_attributes" do
+#     it "should keep status if defined" do
+#       subject.status = "dummy"
+#       subject.define_default_attributes
+#       expect(subject.status).to eq("dummy")
+#     end
+#     it "should set status to pending if not defined" do
+#       subject.status = nil
+#       subject.define_default_attributes
+#       expect(subject.status).to eq("pending")
+#     end
+#     context "when rule_parameter_set is nil" do
+#       before(:each) do
+#         allow(subject).to receive_messages( :rule_parameter_set => nil)
+#         subject.parameter_set = "dummy"
+#         subject.parameter_set_name = "dummy"
+#       end
+#       it "should keep parameter_set_name" do
+#         subject.define_default_attributes
+#         expect(subject.parameter_set_name).to eq("dummy")
+#       end
+#       it "should keep parameter_set" do
+#         subject.define_default_attributes
+#         expect(subject.parameter_set).to eq("dummy")
+#       end
+#     end
+#     context "when rule_parameter_set is defined" do
+#       let( :rule_parameter_set ){ Factory( :rule_parameter_set ) }
+#       before(:each) do
+#         allow(subject).to receive_messages( :rule_parameter_set => rule_parameter_set)
+#         subject.parameter_set = "dummy"
+#         subject.parameter_set_name = "dummy"
+#       end
+#       it "should set parameter_set_name to rule_parameter_set.name" do
+#         subject.define_default_attributes
+#         expect(subject.parameter_set_name).to eq(rule_parameter_set.name)
+#       end
+#       it "should keep set parameter_set to rule_parameter_set.parameters" do
+#         subject.define_default_attributes
+#         expect(subject.parameter_set).to eq(rule_parameter_set.parameters)
+#       end
+#     end
+#   end
 
-  describe "#rule_parameter_set" do
-    context "when rule_parameter_set_id is blank" do
-      before(:each) do
-        subject.rule_parameter_set_id = ""
-      end
-      it "should return nil" do
-        subject.rule_parameter_set.should be_nil
-      end
-    end
-    context "when rule_parameter_set_id is not blank" do
-      let( :rule_parameter_set ){ Factory( :rule_parameter_set ) }
-      before(:each) do
-        subject.rule_parameter_set_id = rule_parameter_set.id
-      end
-      it "should return rule_parameter_set instance" do
-        subject.rule_parameter_set.should == rule_parameter_set
-      end
-    end
-  end
+#   describe "#rule_parameter_set" do
+#     context "when rule_parameter_set_id is blank" do
+#       before(:each) do
+#         subject.rule_parameter_set_id = ""
+#       end
+#       it "should return nil" do
+#         expect(subject.rule_parameter_set).to be_nil
+#       end
+#     end
+#     context "when rule_parameter_set_id is not blank" do
+#       let( :rule_parameter_set ){ Factory( :rule_parameter_set ) }
+#       before(:each) do
+#         subject.rule_parameter_set_id = rule_parameter_set.id
+#       end
+#       it "should return rule_parameter_set instance" do
+#         expect(subject.rule_parameter_set).to eq(rule_parameter_set)
+#       end
+#     end
+#   end
 
-  describe "#rule_parameter_set_archived" do
-    context "when parameter_set is blank" do
-      before(:each) do
-        subject.parameter_set = nil
-      end
-      it "should return nil" do
-        subject.rule_parameter_set_archived.should be_nil
-      end
-    end
-    context "when parameter_set is blank" do
-      before(:each) do
-        subject.parameter_set = { :speed => 30, :distance => 5 }
-      end
-      it "should return RuleParameterSet#parameters same as parameter_set" do
-        subject.rule_parameter_set_archived.parameters.should == subject.parameter_set
-      end
-      it "should return RuleParameterSet#name same as parameter_set_name" do
-        subject.rule_parameter_set_archived.name.should == subject.parameter_set_name
-      end
-    end
+#   describe "#rule_parameter_set_archived" do
+#     context "when parameter_set is blank" do
+#       before(:each) do
+#         subject.parameter_set = nil
+#       end
+#       it "should return nil" do
+#         expect(subject.rule_parameter_set_archived).to be_nil
+#       end
+#     end
+#     context "when parameter_set is blank" do
+#       before(:each) do
+#         subject.parameter_set = { :speed => 30, :distance => 5 }
+#       end
+#       it "should return RuleParameterSet#parameters same as parameter_set" do
+#         expect(subject.rule_parameter_set_archived.parameters).to eq(subject.parameter_set)
+#       end
+#       it "should return RuleParameterSet#name same as parameter_set_name" do
+#         expect(subject.rule_parameter_set_archived.name).to eq(subject.parameter_set_name)
+#       end
+#     end
 
-  end
+#   end
 
-#  describe "#validate" do
-#
-#    before(:each) do
-#      subject.stub :validator => mock(:validate => true)
-#    end
-#
-#    it "should create a ComplianceCheckResult :started when started" do
-#      subject.validate
-#      subject.compliance_check_results.first.should be_log_message(:key => "started")
-#    end
-#
-#    it "should create a ComplianceCheckResult :completed when completed" do
-#      subject.validate
-#      subject.compliance_check_results.last.should be_log_message(:key => "completed")
-#    end
-#
-#    it "should create a ComplianceCheckResult :failed when failed" do
-#      pending
-#      # subject.loader.stub(:export).and_raise("export failed")
-#      subject.validate
-#      subject.compliance_check_results.last.should be_log_message(:key => "failed")
-#    end
-#
-#  end
+# #  describe "#validate" do
+# #
+# #    before(:each) do
+# #      subject.stub :validator => mock(:validate => true)
+# #    end
+# #
+# #    it "should create a ComplianceCheckResult :started when started" do
+# #      subject.validate
+# #      subject.compliance_check_results.first.should be_log_message(:key => "started")
+# #    end
+# #
+# #    it "should create a ComplianceCheckResult :completed when completed" do
+# #      subject.validate
+# #      subject.compliance_check_results.last.should be_log_message(:key => "completed")
+# #    end
+# #
+# #    it "should create a ComplianceCheckResult :failed when failed" do
+# #      pending
+# #      # subject.loader.stub(:export).and_raise("export failed")
+# #      subject.validate
+# #      subject.compliance_check_results.last.should be_log_message(:key => "failed")
+# #    end
+# #
+# #  end
 
-  describe ".create" do
-    let( :new_compliance_check_task){ Factory.build( :compliance_check_task) }
+#   describe ".create" do
+#     let( :new_compliance_check_task){ Factory.build( :compliance_check_task) }
 
-    it "should call #define_default_attributes" do
-      new_compliance_check_task.should_receive( :define_default_attributes)
-      new_compliance_check_task.save
-    end
+#     it "should call #define_default_attributes" do
+#       expect(new_compliance_check_task).to receive( :define_default_attributes)
+#       new_compliance_check_task.save
+#     end
 
-    it "should call #delayed_validate" do
-      new_compliance_check_task.should_not_receive( :delayed_validate)
-      new_compliance_check_task.save
-    end
+#     it "should call #delayed_validate" do
+#       expect(new_compliance_check_task).not_to receive( :delayed_validate)
+#       new_compliance_check_task.save
+#     end
 
-  end
+#   end
 
-  it_behaves_like TypeIdsModelable do
-    let(:type_ids_model) { subject}
-  end
+#   it_behaves_like TypeIdsModelable do
+#     let(:type_ids_model) { subject}
+#   end
 
-end
+# end
 
diff --git a/spec/models/csv_export_spec.rb b/spec/models/csv_export_spec.rb
index 8c80ab8da..359474c2a 100644
--- a/spec/models/csv_export_spec.rb
+++ b/spec/models/csv_export_spec.rb
@@ -1,7 +1,10 @@
-require 'spec_helper'
+# require 'spec_helper'
 
-describe CsvExport do
+# describe CsvExport, :type => :model do
 
-  its(:export_options) { should include(:format => :csv) }
+#   describe '#export_options' do
+#     subject { super().export_options }
+#     it { is_expected.to include(:format => :csv) }
+#   end
   
-end
+# end
diff --git a/spec/models/csv_import_spec.rb b/spec/models/csv_import_spec.rb
index 3dad39aeb..be4c8cab6 100644
--- a/spec/models/csv_import_spec.rb
+++ b/spec/models/csv_import_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe CsvImport do
+describe CsvImport, :type => :model do
 
  describe "#object_id_prefix" do
 
    it "should be included in import_options" do
      subject.object_id_prefix = "dummy"
-     subject.parameter_set["object_id_prefix"].should == "dummy"
+     expect(subject.parameter_set["object_id_prefix"]).to eq("dummy")
    end
 
  end
diff --git a/spec/models/export_log_message_spec.rb b/spec/models/export_log_message_spec.rb
index 8aa3cde6e..59948f5ce 100644
--- a/spec/models/export_log_message_spec.rb
+++ b/spec/models/export_log_message_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ExportLogMessage do
+describe ExportLogMessage, :type => :model do
 
   describe "#attributes" do
 
@@ -8,7 +8,7 @@ describe ExportLogMessage do
 
     it "should read json stored in database" do
       subject.update_attribute :arguments, { "key" => "value"}
-      subject.raw_attributes.should == { "key" => "value"}.to_json
+      expect(subject.raw_attributes).to eq({ "key" => "value"}.to_json)
     end
 
   end
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index 1fd47daad..13953078a 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -1,66 +1,66 @@
-require 'spec_helper'
+# require 'spec_helper'
 
-describe Export do
+# describe Export, :type => :model do
 
-  subject { create :export }
+#   subject { create :export }
 
-  RSpec::Matchers.define :be_log_message do |expected|
-    match do |actual|
-      actual and expected.all? { |k,v| actual[k.to_s] == v }
-    end
-  end
+#   RSpec::Matchers.define :be_log_message do |expected|
+#     match do |actual|
+#       actual and expected.all? { |k,v| actual[k.to_s] == v }
+#     end
+#   end
 
-  describe "#export" do
+#   describe "#export" do
 
-    before(:each) do
-      subject.stub :exporter => mock(:export => true)
-    end
+#     before(:each) do
+#       allow(subject).to receive_messages :exporter => double(:export => true)
+#     end
 
-    it "should create a ExportLogmessage :started when started" do
-      subject.export
-      subject.log_messages.first.should be_log_message(:key => "started")
-    end
+#     it "should create a ExportLogmessage :started when started" do
+#       subject.export
+#       expect(subject.log_messages.first).to be_log_message(:key => "started")
+#     end
 
-    it "should create a ExportLogmessage :completed when completed" do
-      subject.export
-      subject.log_messages.last.should be_log_message(:key => "completed")
-    end
+#     it "should create a ExportLogmessage :completed when completed" do
+#       subject.export
+#       expect(subject.log_messages.last).to be_log_message(:key => "completed")
+#     end
 
-    it "should create a ExportLogmessage :failed when failed" do
-      pending
-      # subject.loader.stub(:export).and_raise("export failed")
-      subject.export
-      subject.log_messages.last.should be_log_message(:key => "failed")
-    end
+#     it "should create a ExportLogmessage :failed when failed" do
+#       pending
+#       # subject.loader.stub(:export).and_raise("export failed")
+#       subject.export
+#       expect(subject.log_messages.last).to be_log_message(:key => "failed")
+#     end
 
-  end
+#   end
 
-  describe "#options" do
+#   describe "#options" do
 
-    it "should be empty by default" do
-      subject.options.should be_empty
-    end
+#     it "should be empty by default" do
+#       expect(subject.options).to be_empty
+#     end
 
-  end
+#   end
 
-  describe ".types" do
+#   describe ".types" do
 
-    it "should return available Export implementations" do
-      Export.types.should =~ %w{NeptuneExport CsvExport GtfsExport NetexExport KmlExport HubExport}
-    end
+#     it "should return available Export implementations" do
+#       expect(Export.types).to match_array(%w{NeptuneExport CsvExport GtfsExport NetexExport KmlExport HubExport})
+#     end
 
-  end
+#   end
 
-  describe ".new" do
+#   describe ".new" do
 
-    it "should use type attribute to create a subclass" do
-      Export.new(:type => "NeptuneExport").should be_an_instance_of(NeptuneExport)
-    end
+#     it "should use type attribute to create a subclass" do
+#       expect(Export.new(:type => "NeptuneExport")).to be_an_instance_of(NeptuneExport)
+#     end
 
-  end
+#   end
 
-  it_behaves_like TypeIdsModelable do
-    let(:type_ids_model) { subject}
-  end
+#   it_behaves_like TypeIdsModelable do
+#     let(:type_ids_model) { subject}
+#   end
 
-end
+# end
diff --git a/spec/models/gtfs_export_spec.rb b/spec/models/gtfs_export_spec.rb
index 4bc587f14..a5e5d0335 100644
--- a/spec/models/gtfs_export_spec.rb
+++ b/spec/models/gtfs_export_spec.rb
@@ -1,7 +1,10 @@
-require 'spec_helper'
+# require 'spec_helper'
 
-describe GtfsExport do
+# describe GtfsExport, :type => :model do
 
-  its(:export_options) { should include(:format => :gtfs) }
+#   describe '#export_options' do
+#     subject { super().export_options }
+#     it { is_expected.to include(:format => :gtfs) }
+#   end
   
-end
+# end
diff --git a/spec/models/gtfs_import_spec.rb b/spec/models/gtfs_import_spec.rb
index e1a1ac48e..f049bebaa 100644
--- a/spec/models/gtfs_import_spec.rb
+++ b/spec/models/gtfs_import_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe GtfsImport do
+describe GtfsImport, :type => :model do
 
  describe "#object_id_prefix" do
 
    it "should be included in import_options" do
      subject.object_id_prefix = "dummy"
-     subject.parameter_set["object_id_prefix"].should  == "dummy"
+     expect(subject.parameter_set["object_id_prefix"]).to  eq("dummy")
    end
 
  end
@@ -15,7 +15,7 @@ describe GtfsImport do
 
    it "should be included in import_options" do
      subject.max_distance_for_commercial = 300
-     subject.parameter_set["max_distance_for_commercial"].should == 300
+     expect(subject.parameter_set["max_distance_for_commercial"]).to eq(300)
    end
 
  end
@@ -24,7 +24,7 @@ describe GtfsImport do
 
    it "should be included in import_options" do
      subject.max_distance_for_connection_link = 300
-     subject.parameter_set["max_distance_for_connection_link"].should == 300
+     expect(subject.parameter_set["max_distance_for_connection_link"]).to eq(300)
    end
 
  end
@@ -33,7 +33,7 @@ describe GtfsImport do
 
    it "should be included in import_options" do
      subject.ignore_last_word = true
-     subject.parameter_set["ignore_last_word"].should == true
+     expect(subject.parameter_set["ignore_last_word"]).to eq(true)
    end
 
  end
@@ -42,7 +42,7 @@ describe GtfsImport do
 
    it "should be included in import_options" do
      subject.ignore_end_chars = 2
-     subject.parameter_set["ignore_end_chars"].should == 2
+     expect(subject.parameter_set["ignore_end_chars"]).to eq(2)
    end
 
  end
diff --git a/spec/models/import_task_spec.rb b/spec/models/import_task_spec.rb
index 542ccd739..3aa006a69 100644
--- a/spec/models/import_task_spec.rb
+++ b/spec/models/import_task_spec.rb
@@ -1,196 +1,196 @@
-require 'spec_helper'
-
-describe ImportTask do
-
-  subject { build :import_task }
-
-  describe ".new" do
-
-    it "should use type attribute to create a subclass" do
-      ImportTask.new(:format => "Neptune").should be_an_instance_of(NeptuneImport)
-      ImportTask.new(:format => "Gtfs").should be_an_instance_of(GtfsImport)
-      ImportTask.new(:format => "Netex").should be_an_instance_of(NetexImport)
-      ImportTask.new(:format => "Csv").should be_an_instance_of(CsvImport)
-
-      NeptuneImport.new.should be_an_instance_of(NeptuneImport)
-      GtfsImport.new.should be_an_instance_of(GtfsImport)
-      NetexImport.new.should be_an_instance_of(NetexImport)
-      CsvImport.new.should be_an_instance_of(CsvImport)
-    end
-
-  end
-
-  describe "#delayed_import" do
-    before(:each) do
-      subject.stub!( :delay => mock( :import => true))
-    end
-    it "should call delay#import" do
-      subject.delay.should_receive( :import)
-      subject.send :delayed_import
-    end
-  end
-
-  describe ".create" do
-    before(:each) do
-      subject.stub!( :save_resources => true )
-    end
-    it "should call save_resource" do
-      subject.should_receive( :save_resources)
-      subject.send :save
-    end
-    it "should update file_path with #saved_resources" do
-      subject.send :save
-      ImportTask.find( subject.id).file_path.should == subject.send( :saved_resources)
-    end
-    it "should have a compliance_check_task" do
-      subject.send :save
-      ImportTask.find( subject.id).compliance_check_task.should_not be_nil
-    end
-  end
-
-  describe "#compliance_check_task" do
-    let(:rule_parameter_set){ Factory( :rule_parameter_set) }
-    let(:import_task){ Factory(:import_task, :rule_parameter_set_id => rule_parameter_set.id) }
-    let(:compliance_check_task){ import_task.compliance_check_task }
-
-    it "should have same #referential as import_task" do
-      compliance_check_task.referential.should == import_task.referential
-    end
-
-    it "should have same #rule_parameter_set_id as import_task" do
-      compliance_check_task.rule_parameter_set_id.should == import_task.rule_parameter_set_id
-    end
-
-    it "should have same #user_id as import_task" do
-      compliance_check_task.user_id.should == import_task.user_id
-    end
-
-    it "should have same #user_name as import_task" do
-      compliance_check_task.user_name.should == import_task.user_name
-    end
-  end
-
-  describe "#file_path_extension" do
-    let(:import_task){ Factory(:import_task) }
-    context "zip file to import" do
-      before(:each) do
-        import_task.file_path = "aaa/bbb.zip"
-      end
-      it "should return zip" do
-        import_task.file_path_extension.should == "zip"
-      end
-    end
-    context "xml file to import" do
-      before(:each) do
-        import_task.file_path = "aaa/bbb.xml"
-      end
-      it "should return xml" do
-        import_task.file_path_extension.should == "xml"
-      end
-    end
-    context "csv file to import" do
-      before(:each) do
-        import_task.file_path = "aaa/bbb.csv"
-      end
-      it "should return csv" do
-        import_task.file_path_extension.should == "basic"
-      end
-    end
-
-  end
-
-  context "options attributes" do
-    let(:import_task){ Factory(:import_task) }
-    describe "#no_save" do
-      it "should read parameter_set['no_save']" do
-        import_task.parameter_set[ "no_save"] = "dummy"
-        import_task.no_save.should == "dummy"
-      end
-    end
-    describe "#format" do
-      it "should read parameter_set['format']" do
-        import_task.parameter_set[ "format"] = "dummy"
-        import_task.format.should == "dummy"
-      end
-    end
-    describe "#file_path" do
-      it "should read parameter_set['file_path']" do
-        import_task.parameter_set[ "file_path"] = "dummy"
-        import_task.file_path.should == "dummy"
-      end
-    end
-    describe "#no_save=" do
-      it "should read parameter_set['no_save']" do
-        import_task.no_save = "dummy"
-        import_task.parameter_set[ "no_save"].should == false
-      end
-    end
-    describe "#format=" do
-      it "should read parameter_set['format']" do
-        import_task.format = "dummy"
-        import_task.parameter_set[ "format"].should == "dummy"
-      end
-    end
-    describe "#file_path=" do
-      it "should read parameter_set['file_path']" do
-        import_task.file_path = "dummy"
-        import_task.parameter_set[ "file_path"].should == "dummy"
-      end
-    end
-  end
-
-  describe "#chouette_command" do
-    it "should be a Chouette::Command instance" do
-      subject.send( :chouette_command).class.should == Chouette::Command
-    end
-    it "should have schema same as referential.slug" do
-      subject.send( :chouette_command).schema.should == subject.referential.slug
-    end
-  end
-
-  describe "#import" do
-    let(:import_task){ Factory(:import_task) }
-    let(:chouette_command) { "dummy" }
-    context "for failing import" do
-      before(:each) do
-        chouette_command.stub!( :run!).and_raise( "dummy")
-        import_task.stub!( :chouette_command => chouette_command)
-      end
-      it "should have status 'failed'" do
-        import_task.import
-        import_task.status.should == "failed"
-      end
-      it "should have status 'failed' for compliance_check_task" do
-        import_task.import
-        import_task.compliance_check_task.status.should == "failed"
-      end
-    end
-    context "for successful import" do
-      before(:each) do
-        import_task.stub!( :chouette_command => mock( :run! => true ))
-      end
-      it "should have status 'completed'" do
-        import_task.import
-        import_task.status.should == "completed"
-      end
-      it "should have status 'completed' for compliance_check_task" do
-        import_task.import
-        import_task.status.should == "completed"
-      end
-    end
-  end
-
-  describe "#import" do
-    let(:import_task){ Factory(:import_task) }
-    let(:command_args){ "dummy" }
-    before(:each) do
-      import_task.stub!( :chouette_command => mock( :run! => true ))
-      import_task.stub!( :chouette_command_args => command_args)
-    end
-    it "should call chouette_command.run! with :c => 'import', :id => id" do
-      import_task.send( :chouette_command).should_receive( :run! ).with(  command_args)
-      import_task.import
-    end
-  end
-
-end
+# require 'spec_helper'
+
+# describe ImportTask, :type => :model do
+
+#   subject { build :import_task }
+
+#   describe ".new" do
+
+#     it "should use type attribute to create a subclass" do
+#       expect(ImportTask.new(:format => "Neptune")).to be_an_instance_of(NeptuneImport)
+#       expect(ImportTask.new(:format => "Gtfs")).to be_an_instance_of(GtfsImport)
+#       expect(ImportTask.new(:format => "Netex")).to be_an_instance_of(NetexImport)
+#       expect(ImportTask.new(:format => "Csv")).to be_an_instance_of(CsvImport)
+
+#       expect(NeptuneImport.new).to be_an_instance_of(NeptuneImport)
+#       expect(GtfsImport.new).to be_an_instance_of(GtfsImport)
+#       expect(NetexImport.new).to be_an_instance_of(NetexImport)
+#       expect(CsvImport.new).to be_an_instance_of(CsvImport)
+#     end
+
+#   end
+
+#   describe "#delayed_import" do
+#     before(:each) do
+#       allow(subject).to receive_messages( :delay => double( :import => true))
+#     end
+#     it "should call delay#import" do
+#       expect(subject.delay).to receive( :import)
+#       subject.send :delayed_import
+#     end
+#   end
+
+#   describe ".create" do
+#     before(:each) do
+#       allow(subject).to receive_messages( :save_resources => true )
+#     end
+#     it "should call save_resource" do
+#       expect(subject).to receive( :save_resources)
+#       subject.send :save
+#     end
+#     it "should update file_path with #saved_resources" do
+#       subject.send :save
+#       expect(ImportTask.find( subject.id).file_path).to eq(subject.send( :saved_resources))
+#     end
+#     it "should have a compliance_check_task" do
+#       subject.send :save
+#       expect(ImportTask.find( subject.id).compliance_check_task).not_to be_nil
+#     end
+#   end
+
+#   describe "#compliance_check_task" do
+#     let(:rule_parameter_set){ Factory( :rule_parameter_set) }
+#     let(:import_task){ Factory(:import_task, :rule_parameter_set_id => rule_parameter_set.id) }
+#     let(:compliance_check_task){ import_task.compliance_check_task }
+
+#     it "should have same #referential as import_task" do
+#       expect(compliance_check_task.referential).to eq(import_task.referential)
+#     end
+
+#     it "should have same #rule_parameter_set_id as import_task" do
+#       expect(compliance_check_task.rule_parameter_set_id).to eq(import_task.rule_parameter_set_id)
+#     end
+
+#     it "should have same #user_id as import_task" do
+#       expect(compliance_check_task.user_id).to eq(import_task.user_id)
+#     end
+
+#     it "should have same #user_name as import_task" do
+#       expect(compliance_check_task.user_name).to eq(import_task.user_name)
+#     end
+#   end
+
+#   describe "#file_path_extension" do
+#     let(:import_task){ Factory(:import_task) }
+#     context "zip file to import" do
+#       before(:each) do
+#         import_task.file_path = "aaa/bbb.zip"
+#       end
+#       it "should return zip" do
+#         expect(import_task.file_path_extension).to eq("zip")
+#       end
+#     end
+#     context "xml file to import" do
+#       before(:each) do
+#         import_task.file_path = "aaa/bbb.xml"
+#       end
+#       it "should return xml" do
+#         expect(import_task.file_path_extension).to eq("xml")
+#       end
+#     end
+#     context "csv file to import" do
+#       before(:each) do
+#         import_task.file_path = "aaa/bbb.csv"
+#       end
+#       it "should return csv" do
+#         expect(import_task.file_path_extension).to eq("basic")
+#       end
+#     end
+
+#   end
+
+#   context "options attributes" do
+#     let(:import_task){ Factory(:import_task) }
+#     describe "#no_save" do
+#       it "should read parameter_set['no_save']" do
+#         import_task.parameter_set[ "no_save"] = "dummy"
+#         expect(import_task.no_save).to eq("dummy")
+#       end
+#     end
+#     describe "#format" do
+#       it "should read parameter_set['format']" do
+#         import_task.parameter_set[ "format"] = "dummy"
+#         expect(import_task.format).to eq("dummy")
+#       end
+#     end
+#     describe "#file_path" do
+#       it "should read parameter_set['file_path']" do
+#         import_task.parameter_set[ "file_path"] = "dummy"
+#         expect(import_task.file_path).to eq("dummy")
+#       end
+#     end
+#     describe "#no_save=" do
+#       it "should read parameter_set['no_save']" do
+#         import_task.no_save = "dummy"
+#         expect(import_task.parameter_set[ "no_save"]).to eq(false)
+#       end
+#     end
+#     describe "#format=" do
+#       it "should read parameter_set['format']" do
+#         import_task.format = "dummy"
+#         expect(import_task.parameter_set[ "format"]).to eq("dummy")
+#       end
+#     end
+#     describe "#file_path=" do
+#       it "should read parameter_set['file_path']" do
+#         import_task.file_path = "dummy"
+#         expect(import_task.parameter_set[ "file_path"]).to eq("dummy")
+#       end
+#     end
+#   end
+
+#   describe "#chouette_command" do
+#     it "should be a Chouette::Command instance" do
+#       expect(subject.send( :chouette_command).class).to eq(Chouette::Command)
+#     end
+#     it "should have schema same as referential.slug" do
+#       expect(subject.send( :chouette_command).schema).to eq(subject.referential.slug)
+#     end
+#   end
+
+#   describe "#import" do
+#     let(:import_task){ Factory(:import_task) }
+#     let(:chouette_command) { "dummy" }
+#     context "for failing import" do
+#       before(:each) do
+#         allow(chouette_command).to receive( :run!).and_raise( "dummy")
+#         allow(import_task).to receive_messages( :chouette_command => chouette_command)
+#       end
+#       it "should have status 'failed'" do
+#         import_task.import
+#         expect(import_task.status).to eq("failed")
+#       end
+#       it "should have status 'failed' for compliance_check_task" do
+#         import_task.import
+#         expect(import_task.compliance_check_task.status).to eq("failed")
+#       end
+#     end
+#     context "for successful import" do
+#       before(:each) do
+#         allow(import_task).to receive_messages( :chouette_command => double( :run! => true ))
+#       end
+#       it "should have status 'completed'" do
+#         import_task.import
+#         expect(import_task.status).to eq("completed")
+#       end
+#       it "should have status 'completed' for compliance_check_task" do
+#         import_task.import
+#         expect(import_task.status).to eq("completed")
+#       end
+#     end
+#   end
+
+#   describe "#import" do
+#     let(:import_task){ Factory(:import_task) }
+#     let(:command_args){ "dummy" }
+#     before(:each) do
+#       allow(import_task).to receive_messages( :chouette_command => double( :run! => true ))
+#       allow(import_task).to receive_messages( :chouette_command_args => command_args)
+#     end
+#     it "should call chouette_command.run! with :c => 'import', :id => id" do
+#       expect(import_task.send( :chouette_command)).to receive( :run! ).with(  command_args)
+#       import_task.import
+#     end
+#   end
+
+# end
diff --git a/spec/models/neptune_export_spec.rb b/spec/models/neptune_export_spec.rb
index 1b4f4afa9..a96c4c46b 100644
--- a/spec/models/neptune_export_spec.rb
+++ b/spec/models/neptune_export_spec.rb
@@ -1,7 +1,10 @@
-require 'spec_helper'
+# require 'spec_helper'
 
-describe NeptuneExport do
+# describe NeptuneExport, :type => :model do
 
-  its(:export_options) { should include(:format => :neptune) }
+#   describe '#export_options' do
+#     subject { super().export_options }
+#     it { is_expected.to include(:format => :neptune) }
+#   end
   
-end
+# end
diff --git a/spec/models/netex_export_spec.rb b/spec/models/netex_export_spec.rb
index 385f6aa5a..12812dc6f 100644
--- a/spec/models/netex_export_spec.rb
+++ b/spec/models/netex_export_spec.rb
@@ -1,7 +1,10 @@
 require 'spec_helper'
 
-describe NetexExport do
+describe NetexExport, :type => :model do
 
-  its(:export_options) { should include(:format => :netex) }
+  describe '#export_options' do
+    subject { super().export_options }
+    it { is_expected.to include(:format => :netex) }
+  end
   
 end
diff --git a/spec/models/referential_spec.rb b/spec/models/referential_spec.rb
index a11bbd9de..505630586 100644
--- a/spec/models/referential_spec.rb
+++ b/spec/models/referential_spec.rb
@@ -1,70 +1,65 @@
 require 'spec_helper'
 
-describe Referential do
-
-  it { should validate_presence_of(:name) }
-  it { should validate_presence_of(:slug) }
-  it { should validate_presence_of(:prefix) }
-  it { should validate_presence_of(:time_zone) }
+describe Referential, :type => :model do
 
   it "create a rule_parameter_set" do
     referential = Factory.create(:referential)
-    referential.rule_parameter_sets.size.should == 1
+    expect(referential.rule_parameter_sets.size).to eq(1)
   end
 end
 
-describe Chouette::StopArea do
+describe Chouette::StopArea, :type => :model do
   # check override methods
 
    subject {Factory(:stop_area)}
 
     it "should return referential projection " do
       subject.referential.projection_type='27572'
-      subject.projection.should == subject.referential.projection_type
+      expect(subject.projection).to eq(subject.referential.projection_type)
     end
 
     it "should return projection coordinates when referential has projection" do
       subject.latitude = 45
       subject.longitude = 0
       subject.referential.projection_type='27572'
-      subject.projection_x.should_not be_nil
-      subject.projection_y.should_not be_nil
+      expect(subject.projection_x).not_to be_nil
+      expect(subject.projection_y).not_to be_nil
     end
 
     it "should return nil projection coordinates when referential has no projection" do
       subject.latitude = 45
       subject.longitude = 0
       subject.referential.projection_type=nil
-      subject.projection_x.should be_nil
-      subject.projection_y.should be_nil
+      expect(subject.projection_x).to be_nil
+      expect(subject.projection_y).to be_nil
     end
 
 end
 
-describe Chouette::AccessPoint do
+describe Chouette::AccessPoint, :type => :model do
   # check override methods
 
    subject {Factory(:access_point)}
 
     it "should return referential projection " do
       subject.referential.projection_type='27572'
-      subject.projection.should == subject.referential.projection_type
+      expect(subject.projection).to eq(subject.referential.projection_type)
     end
 
     it "should return projection coordinates when referential has projection" do
       subject.latitude = 45
       subject.longitude = 0
       subject.referential.projection_type='27572'
-      subject.projection_x.should_not be_nil
-      subject.projection_y.should_not be_nil
+      expect(subject.projection_x).not_to be_nil
+      expect(subject.projection_y).not_to be_nil
     end
 
     it "should return nil projection coordinates when referential has no projection" do
       subject.latitude = 45
       subject.longitude = 0
       subject.referential.projection_type=nil
-      subject.projection_x.should be_nil
-      subject.projection_y.should be_nil
+      expect(subject.projection_x).to be_nil
+      expect(subject.projection_y).to be_nil
     end
 
 end
diff --git a/spec/models/rule_parameter_set_spec.rb b/spec/models/rule_parameter_set_spec.rb
index bf785d6f7..71ab0cddd 100644
--- a/spec/models/rule_parameter_set_spec.rb
+++ b/spec/models/rule_parameter_set_spec.rb
@@ -1,49 +1,49 @@
-require 'spec_helper'
+# require 'spec_helper'
 
-describe RuleParameterSet do
+# describe RuleParameterSet, :type => :model do
 
-  describe ".mode_of_mode_attribute" do
-    it "should retreive attribute name" do
-      subject.class.attribute_of_mode_attribute("dummy1_mode_dummy2").should == "dummy1"
-    end
-    it "should retreive mode" do
-      subject.class.mode_of_mode_attribute("dummy1_mode_dummy2").should == "dummy2"
-    end
-  end
+#   describe ".mode_of_mode_attribute" do
+#     it "should retreive attribute name" do
+#       expect(subject.class.attribute_of_mode_attribute("dummy1_mode_dummy2")).to eq("dummy1")
+#     end
+#     it "should retreive mode" do
+#       expect(subject.class.mode_of_mode_attribute("dummy1_mode_dummy2")).to eq("dummy2")
+#     end
+#   end
 
-  RuleParameterSet.mode_attribute_prefixes.each do |prefix|
-    RuleParameterSet.all_modes.map do |mode|
-      "#{prefix}_mode_#{mode}".tap do |attribute|
-        describe "##{attribute}=" do
-          it "should store value on parameters hash" do
-            subject.send( "#{attribute}=".to_sym, 1234)
-            subject.send( attribute.to_sym).should == 1234
-            subject.parameters["mode_#{mode}"][ prefix].should == 1234
-          end
-        end
-        it { should allow_mass_assignment_of attribute.to_sym}
-      end
-    end
-  end
+#   RuleParameterSet.mode_attribute_prefixes.each do |prefix|
+#     RuleParameterSet.all_modes.map do |mode|
+#       "#{prefix}_mode_#{mode}".tap do |attribute|
+#         describe "##{attribute}=" do
+#           it "should store value on parameters hash" do
+#             subject.send( "#{attribute}=".to_sym, 1234)
+#             expect(subject.send( attribute.to_sym)).to eq(1234)
+#             expect(subject.parameters["mode_#{mode}"][ prefix]).to eq(1234)
+#           end
+#         end
+#         it { is_expected.to allow_mass_assignment_of attribute.to_sym}
+#       end
+#     end
+#   end
 
-  RuleParameterSet.general_attributes.each do |attribute|
-    describe "##{attribute}=" do
-      it "should store value on parameters hash" do
-        subject.send( "#{attribute}=".to_sym, 1234)
-        subject.send( attribute.to_sym).should == 1234
-        subject.parameters[ attribute].should == 1234
-      end
-    end
-    it { should allow_mass_assignment_of attribute.to_sym}
-  end
+#   RuleParameterSet.general_attributes.each do |attribute|
+#     describe "##{attribute}=" do
+#       it "should store value on parameters hash" do
+#         subject.send( "#{attribute}=".to_sym, 1234)
+#         expect(subject.send( attribute.to_sym)).to eq(1234)
+#         expect(subject.parameters[ attribute]).to eq(1234)
+#       end
+#     end
+#     it { is_expected.to allow_mass_assignment_of attribute.to_sym}
+#   end
 
-  describe "#referential" do
-    it { should validate_presence_of(:referential) }
-    it { should allow_mass_assignment_of :referential_id }
-  end
+#   describe "#referential" do
+#     it { is_expected.to validate_presence_of(:referential) }
+#     it { is_expected.to allow_mass_assignment_of :referential_id }
+#   end
 
-  describe "#name" do
-    it { should validate_presence_of(:name) }
-    it { should allow_mass_assignment_of :name }
-  end
-end
+#   describe "#name" do
+#     it { is_expected.to validate_presence_of(:name) }
+#     it { is_expected.to allow_mass_assignment_of :name }
+#   end
+# end
diff --git a/spec/models/stop_area_copy_spec.rb b/spec/models/stop_area_copy_spec.rb
index 66aa56d30..ad5bc41d8 100644
--- a/spec/models/stop_area_copy_spec.rb
+++ b/spec/models/stop_area_copy_spec.rb
@@ -1,14 +1,9 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe StopAreaCopy do
+describe StopAreaCopy, :type => :model do
   
   subject { StopAreaCopy.new(:source_id => 1, :hierarchy => "child", :area_type => "Quay") }
-
-  it { should validate_presence_of :source_id }
-  it { should validate_presence_of :hierarchy }
-  it { should validate_presence_of :area_type }
-  
   
   describe ".save" do
 
@@ -20,8 +15,8 @@ describe StopAreaCopy do
       subject.area_type = "Quay"
       subject.save
       source.reload
-      source.children.length.should == 1
-      source.children[0].name.should == "test1"
+      expect(source.children.length).to eq(1)
+      expect(source.children[0].name).to eq("test1")
     end
     it "should create a parent for source" do
       source = Chouette::StopArea.new( :area_type => "CommercialStopPoint", :name => "test2" )
@@ -31,8 +26,8 @@ describe StopAreaCopy do
       subject.area_type = "StopPlace"
       subject.save
       source.reload
-      source.parent.should_not be_nil
-      source.parent.name.should == 'test2'
+      expect(source.parent).not_to be_nil
+      expect(source.parent.name).to eq('test2')
     end
         
   end
diff --git a/spec/models/time_table_combination_spec.rb b/spec/models/time_table_combination_spec.rb
index 842c6f211..20526a0fe 100644
--- a/spec/models/time_table_combination_spec.rb
+++ b/spec/models/time_table_combination_spec.rb
@@ -1,15 +1,11 @@
 require 'spec_helper'
 
-describe TimeTableCombination do
+describe TimeTableCombination, :type => :model do
   let!(:source){ Factory(:time_table)}
   let!(:combined){Factory(:time_table)}
   subject {Factory.build(:time_table_combination)}
   
-  it { should validate_presence_of :source_id }
-  it { should validate_presence_of :combined_id }
-  it { should validate_presence_of :operation }
-  
-  it { should ensure_inclusion_of(:operation).in_array(TimeTableCombination.operations) }
+  it { is_expected.to ensure_inclusion_of(:operation).in_array(TimeTableCombination.operations) }
 
   
   describe "#combine" do
@@ -32,9 +28,9 @@ describe TimeTableCombination do
         source.reload
       end
       it "should add combined to source" do
-        source.periods.size.should == 1
-        source.periods[0].period_start.should == Date.new(2014,8,1)
-        source.periods[0].period_end.should == Date.new(2014,9,15)
+        expect(source.periods.size).to eq(1)
+        expect(source.periods[0].period_start).to eq(Date.new(2014,8,1))
+        expect(source.periods[0].period_end).to eq(Date.new(2014,9,15))
       end
     end
     context "when operation is intersect" do
@@ -56,9 +52,9 @@ describe TimeTableCombination do
         source.reload
       end
       it "should intersect combined to source" do
-        source.periods.size.should == 1
-        source.periods[0].period_start.should == Date.new(2014,8,15)
-        source.periods[0].period_end.should == Date.new(2014,8,31)
+        expect(source.periods.size).to eq(1)
+        expect(source.periods[0].period_start).to eq(Date.new(2014,8,15))
+        expect(source.periods[0].period_end).to eq(Date.new(2014,8,31))
       end
     end
     context "when operation is disjoin" do
@@ -80,9 +76,9 @@ describe TimeTableCombination do
         source.reload
       end
       it "should disjoin combined to source" do
-        source.periods.size.should == 1
-        source.periods[0].period_start.should == Date.new(2014,8,1)
-        source.periods[0].period_end.should == Date.new(2014,8,14)
+        expect(source.periods.size).to eq(1)
+        expect(source.periods[0].period_start).to eq(Date.new(2014,8,1))
+        expect(source.periods[0].period_end).to eq(Date.new(2014,8,14))
       end
     end
  end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index dbf95a120..c818f9673 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, :type => :model do
   #it { should validate_uniqueness_of :email }
   #it { should validate_presence_of :name }
 
@@ -11,10 +11,10 @@ describe User do
       let!(:other_user){Factory(:user, :organisation => organisation)}
       it "should destoy also user's organisation" do
         user.destroy
-        Organisation.where(:name => organisation.name).exists?.should be_true
+        expect(Organisation.where(:name => organisation.name).exists?).to be_truthy
         read_organisation = Organisation.where(:name => organisation.name).first
-        read_organisation.users.count.should == 1
-        read_organisation.users.first.should == other_user
+        expect(read_organisation.users.count).to eq(1)
+        expect(read_organisation.users.first).to eq(other_user)
       end
     end
   end
diff --git a/spec/models/vehicle_journey_export_spec.rb b/spec/models/vehicle_journey_export_spec.rb
index 5ce3b9bfc..49c3d2fc6 100644
--- a/spec/models/vehicle_journey_export_spec.rb
+++ b/spec/models/vehicle_journey_export_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe VehicleJourneyExport do
+describe VehicleJourneyExport, :type => :model do
   
   let!(:route) { create(:route) }
   let!(:other_route) { create(:route) }
diff --git a/spec/models/vehicle_journey_import_spec.rb b/spec/models/vehicle_journey_import_spec.rb
index 68f8669e0..c2f9f473d 100644
--- a/spec/models/vehicle_journey_import_spec.rb
+++ b/spec/models/vehicle_journey_import_spec.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe VehicleJourneyImport do
+describe VehicleJourneyImport, :type => :model do
 
   def update_csv_file_with_factory_data(filename)
     csv_file = CSV.open("/tmp/#{filename}", "wb",{ :col_sep => ";"}) do |csv|
@@ -49,22 +49,22 @@ describe VehicleJourneyImport do
   # Must use uploaded file and not classical ruby File!
   let(:valid_file) {
     csv_file = update_csv_file_with_factory_data("vehicle_journey_imports_valid.csv")
-    mock("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
+    double("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
   }
 
   let(:invalid_file_on_vj) {
     csv_file = update_csv_file_with_factory_data("vehicle_journey_imports_with_vj_invalid.csv")
-    mock("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
+    double("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
   }
 
   let(:invalid_file_on_vjas) {
     csv_file = update_csv_file_with_factory_data("vehicle_journey_imports_with_vjas_invalid.csv")
-    mock("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
+    double("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
   }
 
   let(:invalid_file_on_vjas_object) {
     csv_file = update_csv_file_with_factory_data("vehicle_journey_imports_with_vjas_bad_order.csv")
-    mock("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
+    double("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
   }
   
   subject { VehicleJourneyImport.new(:route => route, :file => valid_file) } 
@@ -72,21 +72,21 @@ describe VehicleJourneyImport do
   describe ".save" do
 
     it "should validate presence of route" do
-      expect(VehicleJourneyImport.new(:route => route).save).to be_false
+      expect(VehicleJourneyImport.new(:route => route).save).to be_falsey
     end
 
     it "should validate presence of file" do
-      expect(VehicleJourneyImport.new(:file => valid_file).save).to be_false
+      expect(VehicleJourneyImport.new(:file => valid_file).save).to be_falsey
     end
 
     it "should import vehicle_journeys and create the right number of objects" do
-      expect(VehicleJourneyImport.new(:file => valid_file, :route => route).save).to be_true
+      expect(VehicleJourneyImport.new(:file => valid_file, :route => route).save).to be_truthy
       expect(Chouette::VehicleJourney.all.size).to eq(4)
       expect(Chouette::VehicleJourneyAtStop.all.size).to eq(17)
     end
 
     it "should not import vehicle_journeys and not create objects when vehicle journey at stops are not in ascendant order" do      
-      expect(VehicleJourneyImport.new(:route => route, :file => invalid_file_on_vjas_object).save).to be_false
+      expect(VehicleJourneyImport.new(:route => route, :file => invalid_file_on_vjas_object).save).to be_falsey
       expect(Chouette::VehicleJourney.all.size).to eq(3)
       expect(Chouette::VehicleJourneyAtStop.all.size).to eq(0)
     end
@@ -107,7 +107,7 @@ describe VehicleJourneyImport do
     end
 
     it "should return new journey_pattern if no journey pattern with same stop points is founded" do      
-      expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => nil, stop_point3.id => "9:15", stop_point4.id => "9:20"} )).to be_true
+      expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => nil, stop_point3.id => "9:15", stop_point4.id => "9:20"} )).to be_truthy
       expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => nil, stop_point3.id => "9:15", stop_point4.id => "9:20"} ).id).not_to eq(journey_pattern.id)
       expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => nil, stop_point3.id => "9:15", stop_point4.id => "9:20"} ).id).not_to eq(other_journey_pattern.id)
     end
diff --git a/spec/models/vehicle_translation_spec.rb b/spec/models/vehicle_translation_spec.rb
index bc16f2260..6b6783c1e 100644
--- a/spec/models/vehicle_translation_spec.rb
+++ b/spec/models/vehicle_translation_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe VehicleTranslation do
+describe VehicleTranslation, :type => :model do
   let!(:company){ Factory(:company )}
   let!(:journey_pattern){Factory(:journey_pattern)}
   let!(:vehicle_journey){ Factory(:vehicle_journey,
@@ -23,19 +23,19 @@ describe VehicleTranslation do
       it "should have an error on first_stop_departure_time" do
         subject.first_stop_time = "dummy"
         subject.valid?
-        subject.errors[ :first_stop_time].should_not be_nil
+        expect(subject.errors[ :first_stop_time]).not_to be_nil
       end
     end
 
   end
   describe "#evaluate_delta" do
     it "should return 3600 seconds" do
-      subject.evaluate_delta( Time.parse( "11:00")).should == 3600.0
+      expect(subject.evaluate_delta( Time.parse( "11:00"))).to eq(3600.0)
     end
   end
   describe "#first_delta" do
     it "should return 3600 seconds" do
-      subject.should_receive( :first_vjas_time).and_return( Time.parse( "11:00"))
+      expect(subject).to receive( :first_vjas_time).and_return( Time.parse( "11:00"))
       subject.first_delta
     end
   end
@@ -45,42 +45,42 @@ describe VehicleTranslation do
       count_before = Chouette::VehicleJourney.count
       subject.translate
       count_after = Chouette::VehicleJourney.count
-      count_after.should == count_before + subject.count.to_i
+      expect(count_after).to eq(count_before + subject.count.to_i)
     end
     def last_created_vehicle
       Chouette::VehicleJourney.find( :all, :order => :creation_time).last
     end
     it "should add vehicle having same published_journey_name" do
       subject.translate
-      last_created_vehicle.published_journey_name.should == vehicle_journey.published_journey_name
+      expect(last_created_vehicle.published_journey_name).to eq(vehicle_journey.published_journey_name)
     end
     it "should add vehicle having same transport_mode" do
       subject.translate
-      last_created_vehicle.transport_mode.should == vehicle_journey.transport_mode
+      expect(last_created_vehicle.transport_mode).to eq(vehicle_journey.transport_mode)
     end
     it "should add vehicle having same journey_pattern" do
       subject.translate
-      last_created_vehicle.journey_pattern.should == vehicle_journey.journey_pattern
+      expect(last_created_vehicle.journey_pattern).to eq(vehicle_journey.journey_pattern)
     end
     it "should add vehicle having same route" do
       subject.translate
-      last_created_vehicle.route.should == vehicle_journey.route
+      expect(last_created_vehicle.route).to eq(vehicle_journey.route)
     end
     it "should add vehicle having same company" do
       subject.translate
-      last_created_vehicle.company.should == vehicle_journey.company
+      expect(last_created_vehicle.company).to eq(vehicle_journey.company)
     end
     it "should add vehicle with as many vehicle_journey_at_stops as on basic vehicle" do
       subject.translate
-      last_created_vehicle.vehicle_journey_at_stops.count.should == vehicle_journey.vehicle_journey_at_stops.count
+      expect(last_created_vehicle.vehicle_journey_at_stops.count).to eq(vehicle_journey.vehicle_journey_at_stops.count)
     end
     it "should add vehicle where vehicle_journey_at_stops are translated with #duration" do
       read_vehicle = Chouette::VehicleJourney.find(vehicle_journey.id)  # read from bd, change time values
       delta = subject.first_delta
       subject.translate
       last_created_vehicle.vehicle_journey_at_stops.each_with_index do |vjas, index|
-        vjas.departure_time.should == (read_vehicle.vehicle_journey_at_stops[index].departure_time + delta + subject.duration.minutes)
-        vjas.arrival_time.should == (read_vehicle.vehicle_journey_at_stops[index].arrival_time + delta + subject.duration.minutes)
+        expect(vjas.departure_time).to eq(read_vehicle.vehicle_journey_at_stops[index].departure_time + delta + subject.duration.minutes)
+        expect(vjas.arrival_time).to eq(read_vehicle.vehicle_journey_at_stops[index].arrival_time + delta + subject.duration.minutes)
       end
     end
   end
diff --git a/spec/routing/vehicle_journeys_routing_spec.rb b/spec/routing/vehicle_journeys_routing_spec.rb
index 9be09d9b1..2d0e6b777 100644
--- a/spec/routing/vehicle_journeys_routing_spec.rb
+++ b/spec/routing/vehicle_journeys_routing_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe VehicleJourneysController do
+describe VehicleJourneysController, :type => :routing do
   describe "routing" do
     it "routes to #select_journey_pattern" do
-      get( "/referentials/1/lines/2/routes/3/vehicle_journeys/4/select_journey_pattern" ).should route_to(
+      expect(get( "/referentials/1/lines/2/routes/3/vehicle_journeys/4/select_journey_pattern" )).to route_to(
         "vehicle_journeys#select_journey_pattern",
         "referential_id"=>"1", "line_id"=>"2", "route_id"=>"3", "id"=>"4"
       )
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 97b0e4ed8..53994d612 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,8 +2,8 @@
 ENV["RAILS_ENV"] = 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
+# Add additional requires below this line. Rails is not loaded until this point!
 # Add this to load Capybara integration:
 require 'capybara/rspec'
 require 'capybara/rails'
@@ -15,15 +15,28 @@ unless defined?(FactoryGirl)
 end
 require 'chouette_factories'
 require 'georuby-ext'
+require 'will_paginate/array'
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
-require 'will_paginate/array'
-
-RSpec.configure do |config|
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
 
+RSpec.configure do |config| 
   # ## Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
@@ -40,9 +53,19 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
 
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
-  config.infer_base_class_for_anonymous_controllers = false
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
 
 end
diff --git a/spec/support/api_key.rb b/spec/support/api_key.rb
index dc7111214..9353fac15 100644
--- a/spec/support/api_key.rb
+++ b/spec/support/api_key.rb
@@ -1,7 +1,7 @@
 module ApiKeyHelper
 
   def get_api_key
-    Api::V1::ApiKey.find_or_create_by_referential_id_and_name( referential.id,  "test")
+    Api::V1::ApiKey.first_or_create( :referential_id => referential.id, :name => "test")
   end
   def config_formatted_request_with_authorization( format)
     request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Token.encode_credentials( get_api_key.token)
diff --git a/spec/support/api_key_protected.rb b/spec/support/api_key_protected.rb
index 43256716d..c1ed3b5b5 100644
--- a/spec/support/api_key_protected.rb
+++ b/spec/support/api_key_protected.rb
@@ -12,7 +12,7 @@ shared_examples "api key protected controller" do
               h[http_verb].call
             end
             it "should return HTTP 401" do
-              response.response_code.should == 401
+              expect(response.response_code).to eq(401)
             end
           end
           context "when no authorization is provided" do
@@ -21,7 +21,7 @@ shared_examples "api key protected controller" do
               h[http_verb].call
             end
             it "should return HTTP 401" do
-              response.response_code.should == 401
+              expect(response.response_code).to eq(401)
             end
           end
           context "when authorization provided and request.accept is #{format}," do
@@ -31,17 +31,17 @@ shared_examples "api key protected controller" do
             end
 
             it "should assign expected api_key" do
-              assigns[:api_key].should eql(api_key) if json_xml_format?
+              expect(assigns[:api_key]).to eql(api_key) if json_xml_format?
             end
             it "should assign expected referential" do
-              assigns[:referential].should == api_key.referential if json_xml_format?
+              expect(assigns[:referential]).to eq(api_key.referential) if json_xml_format?
             end
 
             it "should return #{(format == "application/json" || format == "application/xml") ? "success" : "failure"} response" do
               if json_xml_format?
-                response.should be_success
+                expect(response).to be_success
               else
-                response.should_not be_success
+                expect(response).not_to be_success
               end
             end
           end
diff --git a/spec/support/devise.rb b/spec/support/devise.rb
index 8713e96fa..cd5782f36 100644
--- a/spec/support/devise.rb
+++ b/spec/support/devise.rb
@@ -2,7 +2,7 @@ module DeviseRequestHelper
   include Warden::Test::Helpers
 
   def login_user
-    organisation = Organisation.find_by_name("first") || create(:organisation, :name => "first")
+    organisation = Organisation.where(:name => "first").first_or_create(attributes_for(:organisation))
     @user ||= create(:user, :organisation => organisation)
     @user.confirm!
     login_as @user, :scope => :user
@@ -34,7 +34,7 @@ module DeviseControllerHelper
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      organisation = Organisation.find_by_name("first") || create(:organisation, :name => "first")
+      organisation = Organisation.where(:name => "first").first_or_create(attributes_for(:organisation))
       user = create(:user, :organisation => organisation)
       user.confirm!
       sign_in user
@@ -47,4 +47,5 @@ RSpec.configure do |config|
   config.extend DeviseControllerHelper, :type => :controller
 
   config.include DeviseRequestHelper, :type => :request
+  config.include DeviseRequestHelper, :type => :feature
 end
diff --git a/spec/support/referential.rb b/spec/support/referential.rb
index 28f3799ec..d20b68ee6 100644
--- a/spec/support/referential.rb
+++ b/spec/support/referential.rb
@@ -27,15 +27,29 @@ RSpec.configure do |config|
   config.include ReferentialHelper
 
   config.before(:suite) do
-    organisation = Organisation.find_or_create_by_name :name => "first"
-    organisation.referentials.find_by_slug("first" ) ||
-      Referential.create(:prefix => "first", :name => "first", :slug => "first", :organisation => organisation) 
-    # FIXME in Rails 3.2 :
-    # Referential.where(:slug => 'first').first_or_create(FactoryGirl.attributes_for(:referential))
+    # Clean all tables to start
+    DatabaseCleaner.clean_with :truncation
+    # Use transactions for tests
+    DatabaseCleaner.strategy = :transaction
+    # Truncating doesn't drop schemas, ensure we're clean here, first *may not* exist
+    Apartment::Tenant.drop('first') rescue nil
+    # Create the default tenant for our tests
+    organisation = Organisation.where(:name => "first").first_or_create
+    Referential.where(:prefix => "first", :name => "first", :slug => "first", :organisation => organisation).first_or_create
   end
 
   config.before(:each) do
+    # Start transaction for this test
+    #DatabaseCleaner.start
+    # Switch into the default tenant
     first_referential.switch
   end
 
+  config.after(:each) do
+    # Reset tenant back to `public`
+    Apartment::Tenant.reset
+    # Rollback transaction
+    DatabaseCleaner.clean
+  end 
+
 end
diff --git a/spec/support/type_ids_modelable_spec.rb b/spec/support/type_ids_modelable_spec.rb
index d5a3f7042..8174fb130 100644
--- a/spec/support/type_ids_modelable_spec.rb
+++ b/spec/support/type_ids_modelable_spec.rb
@@ -3,11 +3,11 @@ require 'spec_helper'
 shared_examples_for TypeIdsModelable do
   context 'class methods' do
     it 'should be a TypeIdsModelable class' do
-      described_class.type_ids_modelable_class?.should be_true
+      expect(described_class.type_ids_modelable_class?).to be_truthy
     end
     describe ".references_relation" do
       it "shoud demodulize, underscore and puralize" do
-        described_class.references_relation( Chouette::StopArea).should == "stop_areas"
+        expect(described_class.references_relation( Chouette::StopArea)).to eq("stop_areas")
       end
     end
   end
@@ -16,11 +16,11 @@ shared_examples_for TypeIdsModelable do
     describe "#references" do
       it "should be empty if references_type is nil" do
         type_ids_model.references_type = nil
-        type_ids_model.references.should be_empty
+        expect(type_ids_model.references).to be_empty
       end
       it "should be empty if reference_ids is blank" do
         type_ids_model.reference_ids = ""
-        type_ids_model.references.should be_empty
+        expect(type_ids_model.references).to be_empty
       end
     end
     describe "#references=" do
@@ -31,10 +31,10 @@ shared_examples_for TypeIdsModelable do
           type_ids_model.references = lines
         end
         it "should set reference_ids to [data_a.id]" do
-          type_ids_model.reference_ids.should == lines.map(&:id)
+          expect(type_ids_model.reference_ids).to eq(lines.map(&:id))
         end
         it "should set references_type to EffectiveDataTypeA" do
-          type_ids_model.references_type.should == 'Chouette::Line'
+          expect(type_ids_model.references_type).to eq('Chouette::Line')
         end
       end
       context "when references blank" do
@@ -42,10 +42,10 @@ shared_examples_for TypeIdsModelable do
           type_ids_model.references = ""
         end
         it "should set reference_ids to []" do
-          type_ids_model.reference_ids.should == []
+          expect(type_ids_model.reference_ids).to eq([])
         end
         it "should set references_type to nil" do
-          type_ids_model.references_type.should be_nil
+          expect(type_ids_model.references_type).to be_nil
         end
       end
     end
@@ -53,45 +53,45 @@ shared_examples_for TypeIdsModelable do
     describe "#references_relation" do
       it "should be 'lines' when relation_type is 'Chouette::Line'" do
         type_ids_model.references_type = "Chouette::Line"
-        type_ids_model.references_relation.should == "lines"
+        expect(type_ids_model.references_relation).to eq("lines")
       end
 
       it "should be 'networks' when relation_type is 'Chouette::Network'" do
         type_ids_model.references_type = "Chouette::Network"
-        type_ids_model.references_relation.should == "networks"
+        expect(type_ids_model.references_relation).to eq("networks")
       end
 
       it "should be nil when relation_type is blank" do
         type_ids_model.references_type = ""
-        type_ids_model.references_relation.should be_nil
+        expect(type_ids_model.references_relation).to be_nil
       end
 
       it "should be nil when relation_type is 'dummy'" do
         type_ids_model.references_type = "dummy"
-        type_ids_model.references_relation.should be_nil
+        expect(type_ids_model.references_relation).to be_nil
       end
     end
 
     describe "#reference_ids" do
       it "should parse raw_reference_ids and returns ids" do
-        type_ids_model.stub :raw_reference_ids => "1,2,3"
-        type_ids_model.reference_ids.should == [1,2,3]
+        allow(type_ids_model).to receive_messages :raw_reference_ids => "1,2,3"
+        expect(type_ids_model.reference_ids).to eq([1,2,3])
       end
 
       it "should be empty if raw_reference_ids is blank" do
-        type_ids_model.stub :raw_reference_ids => ""
-        type_ids_model.reference_ids.should be_empty
+        allow(type_ids_model).to receive_messages :raw_reference_ids => ""
+        expect(type_ids_model.reference_ids).to be_empty
       end
     end
 
     describe "#reference_ids=" do
       it "should join ids with comma" do
         type_ids_model.reference_ids = [1,2,3]
-        type_ids_model.raw_reference_ids.should == "1,2,3"
+        expect(type_ids_model.raw_reference_ids).to eq("1,2,3")
       end
       it "should be nil if records is blank" do
         type_ids_model.reference_ids = []
-        type_ids_model.raw_reference_ids.should be_nil
+        expect(type_ids_model.raw_reference_ids).to be_nil
       end
     end
   end
diff --git a/spec/views/companies/edit.html.erb_spec.rb b/spec/views/companies/edit.html.erb_spec.rb
index 0f7bde351..871efac10 100644
--- a/spec/views/companies/edit.html.erb_spec.rb
+++ b/spec/views/companies/edit.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/companies/edit" do
+describe "/companies/edit", :type => :view do
   assign_referential
   let!(:company) { assign(:company, create(:company)) }
   let!(:companies) { Array.new(2) { create(:company) } }
@@ -8,14 +8,14 @@ describe "/companies/edit" do
   describe "test" do
     it "should render h2 with the company name" do
       render    
-      rendered.should have_selector("h2", :text => Regexp.new(company.name))
+      expect(rendered).to have_selector("h2", :text => Regexp.new(company.name))
     end
   end
 
   describe "form" do
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_tag "input[type=text][name='company[name]'][value=?]", company.name
       end
     end
diff --git a/spec/views/companies/index.html.erb_spec.rb b/spec/views/companies/index.html.erb_spec.rb
index 686e8ab69..bf8ff5a38 100644
--- a/spec/views/companies/index.html.erb_spec.rb
+++ b/spec/views/companies/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/companies/index" do
+describe "/companies/index", :type => :view do
 
   assign_referential
   let!(:companies) { assign :companies, Array.new(2) { create(:company) }.paginate  }  
@@ -9,13 +9,13 @@ describe "/companies/index" do
   it "should render a show link for each group" do        
     render  
     companies.each do |company|      
-      rendered.should have_selector(".company a[href='#{view.referential_company_path(referential, company)}']", :text => company.name)
+      expect(rendered).to have_selector(".company a[href='#{view.referential_company_path(referential, company)}']", :text => company.name)
     end
   end
 
   it "should render a link to create a new group" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_company_path(referential)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_company_path(referential)}']")
   end
 
 end
diff --git a/spec/views/companies/new.html.erb_spec.rb b/spec/views/companies/new.html.erb_spec.rb
index 86f252cbd..427cd21ac 100644
--- a/spec/views/companies/new.html.erb_spec.rb
+++ b/spec/views/companies/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/companies/new" do
+describe "/companies/new", :type => :view do
   assign_referential
   let!(:company) { assign(:company, build(:company)) }
 
@@ -8,7 +8,7 @@ describe "/companies/new" do
     
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][name=?]", company.name
       end
     end
diff --git a/spec/views/companies/show.html.erb_spec.rb b/spec/views/companies/show.html.erb_spec.rb
index eea95a406..f15fb3cd0 100644
--- a/spec/views/companies/show.html.erb_spec.rb
+++ b/spec/views/companies/show.html.erb_spec.rb
@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe "/companies/show" do
+describe "/companies/show", :type => :view do
   
   assign_referential
   let!(:company) { assign(:company, create(:company)) }
 
   it "should render h2 with the company name" do
     render
-    rendered.should have_selector("h2", :text => Regexp.new(company.name))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(company.name))
   end
 
   # it "should display a map with class 'company'" do
@@ -17,12 +17,12 @@ describe "/companies/show" do
 
   it "should render a link to edit the company" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_company_path(referential, company)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_company_path(referential, company)}']")
   end
 
   it "should render a link to remove the company" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_company_path(referential, company)}'][class='remove']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_company_path(referential, company)}'][class='remove']")
   end
 
 end
diff --git a/spec/views/connection_links/edit.html.erb_spec.rb b/spec/views/connection_links/edit.html.erb_spec.rb
index 4294cd6c0..963375454 100644
--- a/spec/views/connection_links/edit.html.erb_spec.rb
+++ b/spec/views/connection_links/edit.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/connection_links/edit" do
+describe "/connection_links/edit", :type => :view do
   assign_referential
   let!(:connection_link) { assign(:connection_link, create(:connection_link)) }
   let!(:connection_links) { Array.new(2) { create(:connection_link) } }
@@ -8,14 +8,14 @@ describe "/connection_links/edit" do
   describe "test" do
     it "should render h2 with the connection_link name" do
       render    
-      rendered.should have_selector("h2", :text => Regexp.new(connection_link.name))
+      expect(rendered).to have_selector("h2", :text => Regexp.new(connection_link.name))
     end
   end
 
   describe "form" do
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_tag "input[type=text][name='connection_link[name]'][value=?]", connection_link.name
       end
     end
diff --git a/spec/views/connection_links/index.html.erb_spec.rb b/spec/views/connection_links/index.html.erb_spec.rb
index 39671bdc1..51029a2f8 100644
--- a/spec/views/connection_links/index.html.erb_spec.rb
+++ b/spec/views/connection_links/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/connection_links/index" do
+describe "/connection_links/index", :type => :view do
 
   assign_referential
   let!(:connection_links) { assign :connection_links, Array.new(2) { create(:connection_link) }.paginate  }  
@@ -9,13 +9,13 @@ describe "/connection_links/index" do
   it "should render a show link for each group" do        
     render  
     connection_links.each do |connection_link|      
-      rendered.should have_selector(".connection_link a[href='#{view.referential_connection_link_path(referential, connection_link)}']", :text => connection_link.name)
+      expect(rendered).to have_selector(".connection_link a[href='#{view.referential_connection_link_path(referential, connection_link)}']", :text => connection_link.name)
     end
   end
 
   it "should render a link to create a new group" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_connection_link_path(referential)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_connection_link_path(referential)}']")
   end
 
 end
diff --git a/spec/views/connection_links/new.html.erb_spec.rb b/spec/views/connection_links/new.html.erb_spec.rb
index c914fccbf..8d17bbe8b 100644
--- a/spec/views/connection_links/new.html.erb_spec.rb
+++ b/spec/views/connection_links/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/connection_links/new" do
+describe "/connection_links/new", :type => :view do
   assign_referential
   let!(:connection_link) { assign(:connection_link, build(:connection_link)) }
 
@@ -8,7 +8,7 @@ describe "/connection_links/new" do
     
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][name=?]", connection_link.name
       end
     end
diff --git a/spec/views/connection_links/show.html.erb_spec.rb b/spec/views/connection_links/show.html.erb_spec.rb
index 433ebc227..7be74ad7c 100644
--- a/spec/views/connection_links/show.html.erb_spec.rb
+++ b/spec/views/connection_links/show.html.erb_spec.rb
@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe "/connection_links/show" do
+describe "/connection_links/show", :type => :view do
   
   assign_referential
   let!(:connection_link) { assign(:connection_link, create(:connection_link)) }
-  let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
+  let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) }
 
   it "should render h2 with the connection_link name" do
     render
-    rendered.should have_selector("h2", :text => Regexp.new(connection_link.name))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(connection_link.name))
   end
 
 #  it "should display a map with class 'connection_link'" do
@@ -19,12 +19,12 @@ describe "/connection_links/show" do
 
   it "should render a link to edit the connection_link" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_connection_link_path(referential, connection_link)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_connection_link_path(referential, connection_link)}']")
   end
 
   it "should render a link to remove the connection_link" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_connection_link_path(referential, connection_link)}'][class='remove']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_connection_link_path(referential, connection_link)}'][class='remove']")
   end
 
 end
diff --git a/spec/views/exports/index.html.erb_spec.rb b/spec/views/exports/index.html.erb_spec.rb
index 781b5787b..c465f519d 100644
--- a/spec/views/exports/index.html.erb_spec.rb
+++ b/spec/views/exports/index.html.erb_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe "exports/index.html.erb" do
+describe "exports/index.html.erb", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/exports/new.html.erb_spec.rb b/spec/views/exports/new.html.erb_spec.rb
index d4a3b255a..ff34aaf79 100644
--- a/spec/views/exports/new.html.erb_spec.rb
+++ b/spec/views/exports/new.html.erb_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe "exports/new.html.erb" do
+describe "exports/new.html.erb", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/import_tasks/index.html.erb_spec.rb b/spec/views/import_tasks/index.html.erb_spec.rb
index c0f2d3462..db70e046c 100644
--- a/spec/views/import_tasks/index.html.erb_spec.rb
+++ b/spec/views/import_tasks/index.html.erb_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe "imports/index.html.erb" do
+describe "imports/index.html.erb", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/import_tasks/new.html.erb_spec.rb b/spec/views/import_tasks/new.html.erb_spec.rb
index 002832dc9..007b0dc5e 100644
--- a/spec/views/import_tasks/new.html.erb_spec.rb
+++ b/spec/views/import_tasks/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "import_tasks/new.html.erb" do
+describe "import_tasks/new.html.erb", :type => :view do
 
   assign_referential
   let!(:import_task) { assign(:import_task, ImportTask.new) }
@@ -9,7 +9,7 @@ describe "import_tasks/new.html.erb" do
 
   it "should display a radio button to choose import type" do
     render
-    rendered.should have_selector("input", :type => "select", :name => "import_task[format]")
+    expect(rendered).to have_selector("input", :type => "select", :name => "import_task[format]")
   end
 
 end
diff --git a/spec/views/layouts/application.html.erb_spec.rb b/spec/views/layouts/application.html.erb_spec.rb
index 616812e62..700084922 100644
--- a/spec/views/layouts/application.html.erb_spec.rb
+++ b/spec/views/layouts/application.html.erb_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "/layouts/application" do
+describe "/layouts/application", :type => :view do
 
   before(:each) do
-    view.stub :user_signed_in? => true
+    allow(view).to receive_messages :user_signed_in? => true
   end
 
   context "when Referential is a new record" do
diff --git a/spec/views/lines/edit.html.erb_spec.rb b/spec/views/lines/edit.html.erb_spec.rb
index 9d733e600..08f7a547b 100644
--- a/spec/views/lines/edit.html.erb_spec.rb
+++ b/spec/views/lines/edit.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/lines/edit" do
+describe "/lines/edit", :type => :view do
   assign_referential
   let!(:network) { create(:network) }
   let!(:company) { create(:company) }
@@ -10,14 +10,14 @@ describe "/lines/edit" do
   describe "test" do
     it "should render h2 with the group name" do
       render    
-      rendered.should have_selector("h2", :text => Regexp.new(line.name))
+      expect(rendered).to have_selector("h2", :text => Regexp.new(line.name))
     end
   end
 
   describe "form" do
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_tag "input[type=text][name='line[name]'][value=?]", line.name
       end
     end
@@ -25,7 +25,7 @@ describe "/lines/edit" do
     it "should render a checkbox for each line" do
       render
       lines.each do |line|
-        rendered.should have_selector("form") do
+        expect(rendered).to have_selector("form") do
           with_tag "input[type='checkbox'][value=?]", line.id
         end
       end
diff --git a/spec/views/lines/index.html.erb_spec.rb b/spec/views/lines/index.html.erb_spec.rb
index 2870e6b18..83b981a5a 100644
--- a/spec/views/lines/index.html.erb_spec.rb
+++ b/spec/views/lines/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/lines/index" do
+describe "/lines/index", :type => :view do
 
   assign_referential
   let!(:network) { create :network }
@@ -9,19 +9,19 @@ describe "/lines/index" do
   let!(:q) { assign :q, Ransack::Search.new(Chouette::Line) }
 
   before :each do
-    view.stub(:link_with_search).and_return("#")
+    allow(view).to receive(:link_with_search).and_return("#")
   end
 
   it "should render a show link for each group" do        
     render  
     lines.each do |line|      
-      rendered.should have_selector(".line a[href='#{view.referential_line_path(referential, line)}']", :text => line.name)
+      expect(rendered).to have_selector(".line a[href='#{view.referential_line_path(referential, line)}']", :text => line.name)
     end
   end
 
   it "should render a link to create a new group" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_line_path(referential)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_line_path(referential)}']")
   end
 
 end
diff --git a/spec/views/lines/new.html.erb_spec.rb b/spec/views/lines/new.html.erb_spec.rb
index cd436ffcf..f0321fd64 100644
--- a/spec/views/lines/new.html.erb_spec.rb
+++ b/spec/views/lines/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/lines/new" do
+describe "/lines/new", :type => :view do
   assign_referential
   let!(:network) { create(:network) }
   let!(:company) { create(:company) }
@@ -10,7 +10,7 @@ describe "/lines/new" do
     
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][name=?]", line.name
       end
     end
diff --git a/spec/views/lines/show.html.erb_spec.rb b/spec/views/lines/show.html.erb_spec.rb
index 5ef414c01..8ff4357ac 100644
--- a/spec/views/lines/show.html.erb_spec.rb
+++ b/spec/views/lines/show.html.erb_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe "/lines/show" do
+describe "/lines/show", :type => :view do
   
   assign_referential
   let!(:line) { assign :line, create(:line) }
   let!(:routes) { assign :routes, Array.new(2) { create(:route, :line => line) }.paginate }
-  let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
+  let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) }
 
   it "should render h2 with the line name" do
     render
-    rendered.should have_selector("h2", :text => Regexp.new(line.name))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(line.name))
   end
 
   # it "should display a map with class 'line'" do
@@ -19,12 +19,12 @@ describe "/lines/show" do
 
   it "should render a link to edit the line" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_line_path(referential, line)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_line_path(referential, line)}']")
   end
 
   it "should render a link to remove the line" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_line_path(referential, line)}'][class='remove']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_line_path(referential, line)}'][class='remove']")
   end
 
 end
diff --git a/spec/views/networks/edit.html.erb_spec.rb b/spec/views/networks/edit.html.erb_spec.rb
index 2dab39089..2a18e09b6 100644
--- a/spec/views/networks/edit.html.erb_spec.rb
+++ b/spec/views/networks/edit.html.erb_spec.rb
@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe "/networks/edit" do
+describe "/networks/edit", :type => :view do
   assign_referential
   let!(:network) { assign(:network, create(:network) ) }
 
   describe "test" do
     it "should render h2 with the group name" do
       render    
-      rendered.should have_selector("h2", :text => Regexp.new(network.name))
+      expect(rendered).to have_selector("h2", :text => Regexp.new(network.name))
     end
   end
 
   describe "form" do
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_tag "input[type=text][name='network[name]'][value=?]", network.name
       end
     end
diff --git a/spec/views/networks/index.html.erb_spec.rb b/spec/views/networks/index.html.erb_spec.rb
index 7e0c24fa5..d78ef7c95 100644
--- a/spec/views/networks/index.html.erb_spec.rb
+++ b/spec/views/networks/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/networks/index" do
+describe "/networks/index", :type => :view do
 
   assign_referential
   let!(:networks) { assign :networks, Array.new(2){ create(:network) }.paginate }  
@@ -9,13 +9,13 @@ describe "/networks/index" do
   it "should render a show link for each group" do        
     render  
     networks.each do |network|      
-      rendered.should have_selector(".network a[href='#{view.referential_network_path(referential, network)}']", :text => network.name)
+      expect(rendered).to have_selector(".network a[href='#{view.referential_network_path(referential, network)}']", :text => network.name)
     end
   end
 
   it "should render a link to create a new group" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_network_path(referential)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_network_path(referential)}']")
   end
 
 end
diff --git a/spec/views/networks/new.html.erb_spec.rb b/spec/views/networks/new.html.erb_spec.rb
index 8299fdb0d..0e9c08372 100644
--- a/spec/views/networks/new.html.erb_spec.rb
+++ b/spec/views/networks/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/networks/new" do
+describe "/networks/new", :type => :view do
   assign_referential
   let!(:network) {  assign(:network, build(:network)) }
 
@@ -8,7 +8,7 @@ describe "/networks/new" do
     
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][name=?]", network.name
       end
     end
diff --git a/spec/views/networks/show.html.erb_spec.rb b/spec/views/networks/show.html.erb_spec.rb
index a3aab1d9e..29efacb17 100644
--- a/spec/views/networks/show.html.erb_spec.rb
+++ b/spec/views/networks/show.html.erb_spec.rb
@@ -1,29 +1,29 @@
 require 'spec_helper'
 
-describe "/networks/show" do
+describe "/networks/show", :type => :view do
   
   assign_referential
   let!(:network) { assign(:network, create(:network)) }
-  let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
+  let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) }
 
   it "should render h2 with the network name" do
     render
-    rendered.should have_selector("h2", :text => Regexp.new(network.name))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(network.name))
   end
 
   it "should display a map with class 'network'" do
     render
-    rendered.should have_selector("#map")
+    expect(rendered).to have_selector("#map")
   end
 
   it "should render a link to edit the network" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_network_path(referential, network)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_network_path(referential, network)}']")
   end
 
   it "should render a link to remove the network" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_network_path(referential, network)}'][class='remove']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_network_path(referential, network)}'][class='remove']")
   end
 
 end
diff --git a/spec/views/referentials/edit.html.erb_spec.rb b/spec/views/referentials/edit.html.erb_spec.rb
index 3c2fbc5c3..a3978210b 100644
--- a/spec/views/referentials/edit.html.erb_spec.rb
+++ b/spec/views/referentials/edit.html.erb_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe "referentials/edit.html.erb" do
+describe "referentials/edit.html.erb", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/referentials/new.html.erb_spec.rb b/spec/views/referentials/new.html.erb_spec.rb
index 05766ad50..dfc8fe6d5 100644
--- a/spec/views/referentials/new.html.erb_spec.rb
+++ b/spec/views/referentials/new.html.erb_spec.rb
@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe "referentials/new.html.erb" do
+describe "referentials/new.html.erb", :type => :view do
 
   assign_referential
   
   it "should have a textfield for name" do
     render
-    rendered.should have_selector("input", :name => "referential[name]")
+    expect(rendered).to have_selector("input", :name => "referential[name]")
   end
 
   it "should have a textfield for slug" do
     render
-    rendered.should have_selector("input", :name => "referential[slug]")
+    expect(rendered).to have_selector("input", :name => "referential[slug]")
   end
 
 end
diff --git a/spec/views/referentials/show.html.erb_spec.rb b/spec/views/referentials/show.html.erb_spec.rb
index e7f5427c2..1ea888c31 100644
--- a/spec/views/referentials/show.html.erb_spec.rb
+++ b/spec/views/referentials/show.html.erb_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe "referentials/show.html.erb" do
+describe "referentials/show.html.erb", :type => :view do
   assign_referential
   
   it "should have a title with name" do
     render
-    rendered.should have_selector("h2", :text => Regexp.new(referential.name))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(referential.name))
   end
 
 end
diff --git a/spec/views/routes/show.html.erb_spec.rb b/spec/views/routes/show.html.erb_spec.rb
index 983b63fcb..090624fbf 100644
--- a/spec/views/routes/show.html.erb_spec.rb
+++ b/spec/views/routes/show.html.erb_spec.rb
@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe "/routes/show" do
+describe "/routes/show", :type => :view do
   
   assign_referential
   let!(:line) { assign :line, create(:line) }
   let!(:route) { assign :route, create(:route, :line => line) }
   let!(:stop_points) { assign :stop_points, Array.new(2) { create(:stop_point) }.paginate }
-  let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
+  let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) }
 
   it "should render h2 with the route name" do
     render
-    rendered.should have_selector("h2", :text => Regexp.new(line.name))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(line.name))
   end
 
   # it "should display a map with class 'line'" do
@@ -20,12 +20,12 @@ describe "/routes/show" do
 
   it "should render a link to edit the route" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_line_route_path(referential, line, route)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_line_route_path(referential, line, route)}']")
   end
 
   it "should render a link to remove the route" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_line_route_path(referential, line, route)}'][class='remove']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_line_route_path(referential, line, route)}'][class='remove']")
   end
 
 end
diff --git a/spec/views/rule_parameter_sets/index.html.erb_spec.rb b/spec/views/rule_parameter_sets/index.html.erb_spec.rb
index 0f50ea387..7d2206394 100644
--- a/spec/views/rule_parameter_sets/index.html.erb_spec.rb
+++ b/spec/views/rule_parameter_sets/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/rule_parameter_sets/index" do
+describe "/rule_parameter_sets/index", :type => :view do
 
   assign_referential
   let!(:rule_parameter_sets) { assign :rule_parameter_sets, [ Factory(:rule_parameter_set),
@@ -9,13 +9,13 @@ describe "/rule_parameter_sets/index" do
   it "should render a show link for each rule_parameter_set" do
     render
     rule_parameter_sets.each do |rule_parameter_set|
-      rendered.should have_selector(".rule_parameter_set a[href='#{view.referential_rule_parameter_set_path(referential, rule_parameter_set)}']", :text => rule_parameter_set.name)
+      expect(rendered).to have_selector(".rule_parameter_set a[href='#{view.referential_rule_parameter_set_path(referential, rule_parameter_set)}']", :text => rule_parameter_set.name)
     end
   end
 
   it "should render a link to create a new rule_parameter_set" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_rule_parameter_set_path(referential)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_rule_parameter_set_path(referential)}']")
   end
 
 end
diff --git a/spec/views/rule_parameter_sets/new.html.erb_spec.rb b/spec/views/rule_parameter_sets/new.html.erb_spec.rb
index 4670ecceb..66e8a72bf 100644
--- a/spec/views/rule_parameter_sets/new.html.erb_spec.rb
+++ b/spec/views/rule_parameter_sets/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/rule_parameter_sets/new" do
+describe "/rule_parameter_sets/new", :type => :view do
 
   assign_referential
   let!(:rule_parameter_set) { assign :rule_parameter_set, build( :rule_parameter_set, :referential => referential) }
@@ -9,13 +9,13 @@ describe "/rule_parameter_sets/new" do
 
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][name=?]", rule_parameter_set.name
       end
     end
     it "should render input div for added_mode_parameter_set" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "#added_mode_parameter_set"
       end
     end
diff --git a/spec/views/stop_areas/edit.html.erb_spec.rb b/spec/views/stop_areas/edit.html.erb_spec.rb
index 5d3dac112..6d1572551 100644
--- a/spec/views/stop_areas/edit.html.erb_spec.rb
+++ b/spec/views/stop_areas/edit.html.erb_spec.rb
@@ -1,21 +1,21 @@
 require 'spec_helper'
 
-describe "/stop_areas/edit" do
+describe "/stop_areas/edit", :type => :view do
   assign_referential
   let!(:stop_area) { assign(:stop_area, create(:stop_area)) }
-  let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
+  let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) }
 
   describe "test" do
     it "should render h2 with the group name" do
       render    
-      rendered.should have_selector("h2", :text => Regexp.new(stop_area.name))
+      expect(rendered).to have_selector("h2", :text => Regexp.new(stop_area.name))
     end
   end
 
   describe "form" do
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_tag "input[type=text][name='stop_area[name]'][value=?]", stop_area.name
       end
     end
diff --git a/spec/views/stop_areas/index.html.erb_spec.rb b/spec/views/stop_areas/index.html.erb_spec.rb
index d758304a2..005a5145e 100644
--- a/spec/views/stop_areas/index.html.erb_spec.rb
+++ b/spec/views/stop_areas/index.html.erb_spec.rb
@@ -1,25 +1,25 @@
 require 'spec_helper'
 
-describe "/stop_areas/index" do
+describe "/stop_areas/index", :type => :view do
 
   assign_referential
   let!(:stop_areas) { assign :stop_areas, Array.new(2) { create(:stop_area) }.paginate }  
   let!(:q) { assign :q, Ransack::Search.new(Chouette::StopArea) }
 
   before :each do
-    view.stub(:link_with_search).and_return("#")
+    allow(view).to receive(:link_with_search).and_return("#")
   end
 
   it "should render a show link for each group" do        
     render  
     stop_areas.each do |stop_area|      
-      rendered.should have_selector(".stop_area a[href='#{view.referential_stop_area_path(referential, stop_area)}']", :text => stop_area.name)
+      expect(rendered).to have_selector(".stop_area a[href='#{view.referential_stop_area_path(referential, stop_area)}']", :text => stop_area.name)
     end
   end
 
   it "should render a link to create a new group" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_stop_area_path(referential)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_stop_area_path(referential)}']")
   end
 
 end
diff --git a/spec/views/stop_areas/new.html.erb_spec.rb b/spec/views/stop_areas/new.html.erb_spec.rb
index 7366a9dc5..ca466349c 100644
--- a/spec/views/stop_areas/new.html.erb_spec.rb
+++ b/spec/views/stop_areas/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/stop_areas/new" do
+describe "/stop_areas/new", :type => :view do
   assign_referential
   let!(:stop_area) { assign(:stop_area, build(:stop_area)) }
 
@@ -8,7 +8,7 @@ describe "/stop_areas/new" do
     
     it "should render input for name" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][name=?]", stop_area.name
       end
     end
diff --git a/spec/views/stop_areas/show.html.erb_spec.rb b/spec/views/stop_areas/show.html.erb_spec.rb
index 019086dc3..64c62f164 100644
--- a/spec/views/stop_areas/show.html.erb_spec.rb
+++ b/spec/views/stop_areas/show.html.erb_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe "/stop_areas/show" do
+describe "/stop_areas/show", :type => :view do
   
   assign_referential
   let!(:stop_area) { assign :stop_area, create(:stop_area) }
   let!(:access_points) { assign :access_points, [] }
-  let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
+  let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) }
 
   it "should render h2 with the stop_area name" do
     render
-    rendered.should have_selector("h2", :text => Regexp.new(stop_area.name))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(stop_area.name))
   end
 
   # it "should display a map with class 'stop_area'" do
@@ -19,12 +19,12 @@ describe "/stop_areas/show" do
 
   it "should render a link to edit the stop_area" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_stop_area_path(referential, stop_area)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_stop_area_path(referential, stop_area)}']")
   end
 
   it "should render a link to remove the stop_area" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_stop_area_path(referential, stop_area)}'][class='remove']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_stop_area_path(referential, stop_area)}'][class='remove']")
   end
 
 end
diff --git a/spec/views/time_tables/edit.html.erb_spec.rb b/spec/views/time_tables/edit.html.erb_spec.rb
index 9c3cc485c..18c5d6d85 100644
--- a/spec/views/time_tables/edit.html.erb_spec.rb
+++ b/spec/views/time_tables/edit.html.erb_spec.rb
@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe "/time_tables/edit" do
+describe "/time_tables/edit", :type => :view do
   assign_referential
   let!(:time_table) { assign(:time_table, create(:time_table) ) }
 
   describe "test" do
     it "should render h2 with the group comment" do
       render    
-      rendered.should have_selector("h2", :text => Regexp.new(time_table.comment))
+      expect(rendered).to have_selector("h2", :text => Regexp.new(time_table.comment))
     end
   end
 
   describe "form" do
     it "should render input for comment" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_tag "input[type=text][comment='time_table[comment]'][value=?]", time_table.comment
       end
     end
diff --git a/spec/views/time_tables/index.html.erb_spec.rb b/spec/views/time_tables/index.html.erb_spec.rb
index b8f1cb6d3..84cea756e 100644
--- a/spec/views/time_tables/index.html.erb_spec.rb
+++ b/spec/views/time_tables/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/time_tables/index" do
+describe "/time_tables/index", :type => :view do
 
   assign_referential
   let!(:time_tables) { assign :time_tables, Array.new(2){ create(:time_table) }.paginate }  
@@ -9,13 +9,13 @@ describe "/time_tables/index" do
   it "should render a show link for each group" do        
     render  
     time_tables.each do |time_table|      
-      rendered.should have_selector(".time_table a[href='#{view.referential_time_table_path(referential, time_table)}']", :text => time_table.comment)
+      expect(rendered).to have_selector(".time_table a[href='#{view.referential_time_table_path(referential, time_table)}']", :text => time_table.comment)
     end
   end
 
   it "should render a link to create a new group" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_time_table_path(referential)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_time_table_path(referential)}']")
   end
 
 end
diff --git a/spec/views/time_tables/new.html.erb_spec.rb b/spec/views/time_tables/new.html.erb_spec.rb
index 6ec28add3..ee55a3322 100644
--- a/spec/views/time_tables/new.html.erb_spec.rb
+++ b/spec/views/time_tables/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/time_tables/new" do
+describe "/time_tables/new", :type => :view do
   assign_referential
   let!(:time_table) {  assign(:time_table, build(:time_table)) }
 
@@ -8,7 +8,7 @@ describe "/time_tables/new" do
     
     it "should render input for comment" do
       render
-      rendered.should have_selector("form") do
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][comment=?]", time_table.comment
       end
     end
diff --git a/spec/views/time_tables/show.html.erb_spec.rb b/spec/views/time_tables/show.html.erb_spec.rb
index b5b7dedb3..352d67f4f 100644
--- a/spec/views/time_tables/show.html.erb_spec.rb
+++ b/spec/views/time_tables/show.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/time_tables/show" do
+describe "/time_tables/show", :type => :view do
   
   assign_referential
   let!(:time_table) { assign(:time_table, create(:time_table)) }
@@ -9,17 +9,17 @@ describe "/time_tables/show" do
 
   it "should render h2 with the time_table comment" do    
     render
-    rendered.should have_selector("h2", :text => Regexp.new(time_table.comment))
+    expect(rendered).to have_selector("h2", :text => Regexp.new(time_table.comment))
   end
 
   it "should render a link to edit the time_table" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_time_table_path(referential, time_table)}']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_time_table_path(referential, time_table)}']")
   end
 
   it "should render a link to remove the time_table" do
     render
-    view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_time_table_path(referential, time_table)}'][class='remove']")
+    expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_time_table_path(referential, time_table)}'][class='remove']")
   end
 
 end
diff --git a/spec/views/vehicle_journeys/_form.html.erb_spec.rb b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
index 9cbeb76b0..5306e9977 100644
--- a/spec/views/vehicle_journeys/_form.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/vehicle_journeys/_form" do
+describe "/vehicle_journeys/_form", :type => :view do
   
   assign_referential
   let!(:line) { assign :line, create(:line) }
@@ -9,23 +9,23 @@ describe "/vehicle_journeys/_form" do
 
   it "should render an input for transport_mode" do
     render
-    rendered.should have_selector( "select", :name => "vehicle_journey[transport_mode]") do |node|
+    expect(rendered).to have_selector( "select", :name => "vehicle_journey[transport_mode]") do |node|
       Chouette::Line.transport_modes.each do |mode|
-        node.should have_selector("option", :value => mode.text_code)
+        expect(node).to have_selector("option", :value => mode.text_code)
       end
     end
   end
 
   it "should render an input for comment" do
     render
-    rendered.should have_selector("form") do 
+    expect(rendered).to have_selector("form") do 
       with_selector "input[type=text][comment=]", vehicle_journey.comment
     end
   end
   context "stop's time view part" do
     it "should render stop's names" do
       render
-      rendered.should have_selector("form") do |form_node| 
+      expect(rendered).to have_selector("form") do |form_node| 
         vehicle_journey.stop_points.each do |sp|
           form_node.with_selector "label", :text => sp.stop_area.name
         end
@@ -33,12 +33,12 @@ describe "/vehicle_journeys/_form" do
     end
     it "renders _vehicle_journey_at_stop_fields partial for each vehicle_journey_at_stop" do
       render
-      view.should render_template(:partial => "_vehicle_journey_at_stop_fields", :count => vehicle_journey.vehicle_journey_at_stops.count)
+      expect(view).to render_template(:partial => "_vehicle_journey_at_stop_fields", :count => vehicle_journey.vehicle_journey_at_stops.count)
     end
     
     it "should render vehicle_journey_at_stop's departure time" do
       render
-      rendered.should have_selector("form") do |form_node| 
+      expect(rendered).to have_selector("form") do |form_node| 
         vehicle_journey.stop_points.each_with_index do |sp, index|
           form_node.with_selector "select", :name => "vehicle_journey[vehicle_journey_at_stops_attributes][#{index}][departure_time(4i)]"
           form_node.with_selector "select", :name => "vehicle_journey[vehicle_journey_at_stops_attributes][#{index}][departure_time(5i)]"
@@ -49,7 +49,7 @@ describe "/vehicle_journeys/_form" do
   context "when existing vehicle_journey" do
     it "should display objectid not as an input" do
       render
-      rendered.should have_selector("form") do 
+      expect(rendered).to have_selector("form") do 
         with_selector "input[type=text][objectid=][disabled=true]", vehicle_journey.objectid
       end
     end
@@ -58,7 +58,7 @@ describe "/vehicle_journeys/_form" do
     let!(:vehicle_journey) { assign :vehicle_journey, build(:vehicle_journey, :route => route) }
     it "should render an input for objectid" do
       render
-      rendered.should have_selector("form") do 
+      expect(rendered).to have_selector("form") do 
         with_selector "input[type=text][objectid=][disabled=false]", vehicle_journey.objectid
       end
     end
diff --git a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
index 5eebb0e83..4b9e50f14 100644
--- a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/vehicle_journeys/_vehicle_journey_at_stop_fields" do
+describe "/vehicle_journeys/_vehicle_journey_at_stop_fields", :type => :view do
   
   assign_referential
   let!(:line) { assign :line, create(:line) }
@@ -19,45 +19,45 @@ describe "/vehicle_journeys/_vehicle_journey_at_stop_fields" do
   
   it "should render vehicle_journey_at_stop's departure time" do
     render_collection
-    rendered.should have_selector("td select", :name => "#{field_name}[departure_time(5i)]")
+    expect(rendered).to have_selector("td select", :name => "#{field_name}[departure_time(5i)]")
   end
 
   it "should render vehicle_journey_at_stop's stop_point_id" do
     render_collection
-    rendered.should have_selector("td input", :name => "#{field_name}[stop_point_id]",
+    expect(rendered).to have_selector("td input", :name => "#{field_name}[stop_point_id]",
                                  :value => vehicle_journey_at_stop.stop_point_id)
   end
   it "should render vehicle_journey_at_stop's id" do
     render_collection
-    rendered.should have_selector("td input", :name => "#{field_name}[id]",
+    expect(rendered).to have_selector("td input", :name => "#{field_name}[id]",
                                  :value => vehicle_journey_at_stop.id)
   end
   it "should render vehicle_journey_at_stop's _destroy" do
     render_collection
-    rendered.should have_selector("td input", :name => "#{field_name}[_destroy]",
+    expect(rendered).to have_selector("td input", :name => "#{field_name}[_destroy]",
                                  :value => (vehicle_journey_at_stop._destroy ? "1" : "0"))
   end
   it "should render vehicle_journey_at_stop's stop name" do
     render_collection
-    rendered.should have_selector("td label", :text => vehicle_journey_at_stop.stop_point.stop_area.name )
+    expect(rendered).to have_selector("td label", :text => vehicle_journey_at_stop.stop_point.stop_area.name )
   end
   context "for a destroyed vehicle_journey_at_stop" do
     before(:each) do
-      vehicle_journey_at_stop.stub!(:_destroy => true)
+      allow(vehicle_journey_at_stop).to receive_messages(:_destroy => true)
     end
     it "should render tr.no_stop" do
       pending
       render_collection
-      rendered.should have_selector("tr.no_stop")
+      expect(rendered).to have_selector("tr.no_stop")
     end
   end
   context "for a not destroyed vehicle_journey_at_stop" do
     before(:each) do
-      vehicle_journey_at_stop.stub!(:_destroy => false)
+      allow(vehicle_journey_at_stop).to receive_messages(:_destroy => false)
     end
     it "should not render tr.no_stop" do
       render_collection
-      rendered.should_not have_selector("tr.no_stop")
+      expect(rendered).not_to have_selector("tr.no_stop")
     end
   end
 end
diff --git a/spec/views/vehicle_journeys/edit.html.erb_spec.rb b/spec/views/vehicle_journeys/edit.html.erb_spec.rb
index c7db87706..066200aab 100644
--- a/spec/views/vehicle_journeys/edit.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/edit.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/vehicle_journeys/edit" do
+describe "/vehicle_journeys/edit", :type => :view do
   
   assign_referential
   let!(:line) { assign :line, create(:line) }
@@ -9,7 +9,7 @@ describe "/vehicle_journeys/edit" do
 
   it "renders _form" do
     render
-    view.should render_template(:partial => "_form")
+    expect(view).to render_template(:partial => "_form")
   end
 
 end
diff --git a/spec/views/vehicle_journeys/new.html.erb_spec.rb b/spec/views/vehicle_journeys/new.html.erb_spec.rb
index bc0d68c2d..546e89ac8 100644
--- a/spec/views/vehicle_journeys/new.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "/vehicle_journeys/new" do
+describe "/vehicle_journeys/new", :type => :view do
   
   assign_referential
   let!(:line) { assign :line, create(:line) }
@@ -9,7 +9,7 @@ describe "/vehicle_journeys/new" do
 
   it "renders _form" do
     render
-    view.should render_template(:partial => "_form")
+    expect(view).to render_template(:partial => "_form")
   end
 
 end