diff --git a/.travis.yml b/.travis.yml
index 3b045e78..42cd3cd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
 language: ruby
+before_install:
+  - gem update --system
+  - gem install bundler
 sudo: false
 cache: bundler
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - rbx
-  - jruby-9.1.16.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
+  - ruby-head
+  - jruby-9.2.6.0
 jdk:
-  - openjdk7
+  - openjdk11
 script: bundle exec rake test
 env:
   matrix:
@@ -17,35 +21,22 @@ env:
     - DEVISE_ORM=mongoid
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile.devise-4.0
-  - gemfiles/Gemfile.devise-4.1
-  - gemfiles/Gemfile.devise-4.4
-  - gemfiles/Gemfile.rails-4.2
   - gemfiles/Gemfile.rails-5.0
+  - gemfiles/Gemfile.rails-5.1
+  - gemfiles/Gemfile.rails-5.2
+  - gemfiles/Gemfile.rails-master
 install: "travis_retry bundle install"
 services:
   - mongodb
 matrix:
   exclude:
-    - rvm: 2.1.10
-      gemfile: Gemfile
-    - rvm: 2.4.3
-      gemfile: gemfiles/Gemfile.devise-4.0
-    - rvm: 2.4.3
-      gemfile: gemfiles/Gemfile.devise-4.1
-    - rvm: 2.5.0
-      gemfile: gemfiles/Gemfile.devise-4.0
-    - rvm: 2.5.0
-      gemfile: gemfiles/Gemfile.devise-4.1
-  include:
-    - rvm: 2.5.0
+    - rvm: 2.2.10
       gemfile: gemfiles/Gemfile.rails-master
-      env: DEVISE_ORM=active_record
-    - rvm: 2.5.0
+    - rvm: 2.3.8
+      gemfile: gemfiles/Gemfile.rails-master
+    - rvm: 2.4.5
       gemfile: gemfiles/Gemfile.rails-master
-      env: DEVISE_ORM=mongoid
   allow_failures:
-    - rvm: rbx
-    - rvm: jruby-9.1.16.0
-      gemfile: Gemfile
+    - rvm: jruby-9.2.6.0
+    - rvm: ruby-head
     - gemfile: gemfiles/Gemfile.rails-master
diff --git a/Gemfile b/Gemfile
index d75a4a0d..e1e52ea1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,24 +1,23 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 5.0.pre1'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1'
   end
 
   platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
+    gem 'sqlite3', '~> 1.3.6'
   end
 
-  gem 'devise', '~> 4.0'
-  gem 'activerecord', '~> 5.1.0'
-  gem 'actionmailer', '~> 5.1.0'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
+  gem 'actionmailer', '~> 5.2.2'
+  gem 'activerecord', '~> 5.2.2'
+  gem 'capybara'
+  gem 'devise', '~> 4.6'
   gem 'mocha'
+  gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master'
   gem 'nokogiri'
   gem 'rspec-rails'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1bd413e4..ea0c24a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,147 +2,148 @@ PATH
   remote: .
   specs:
     devise_invitable (1.7.5)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
+      actionmailer (>= 5.0)
+      devise (~> 4.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activerecord-jdbc-adapter (5.0.pre1)
-      activerecord (>= 2.2)
-    activerecord-jdbcsqlite3-adapter (5.0.pre1)
-      activerecord-jdbc-adapter (~> 5.0.pre1)
-      jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (5.1.5)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activerecord-jdbc-adapter (52.1-java)
+      activerecord (~> 5.2.0)
+    activerecord-jdbcsqlite3-adapter (52.1-java)
+      activerecord-jdbc-adapter (= 52.1)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (8.0.0)
-    bcrypt (3.1.11)
-    bcrypt (3.1.11-java)
-    bson (4.3.0)
-    bson (4.3.0-java)
+    arel (9.0.0)
+    bcrypt (3.1.12)
+    bcrypt (3.1.12-java)
+    bson (4.4.2)
+    bson (4.4.2-java)
     builder (3.2.3)
-    capybara (3.0.1)
+    capybara (3.13.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      xpath (~> 3.0)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    crass (1.0.3)
-    devise (4.4.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
-    erubi (1.7.1)
-    globalid (0.4.1)
+    erubi (1.8.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.9.5)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
-    jdbc-sqlite3 (3.8.11.2)
-    loofah (2.2.2)
+    jdbc-sqlite3 (3.20.1)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     metaclass (0.0.4)
-    method_source (0.9.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mocha (1.5.0)
+    mocha (1.8.0)
       metaclass (~> 0.0.1)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (7.0.0)
+    mongo (2.7.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (7.0.2)
       activemodel (>= 5.1, < 6.0.0)
       mongo (>= 2.5.1, < 3.0.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    nokogiri (1.8.2-java)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.1-java)
     orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (2.0.4)
-    rack-test (1.0.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.3.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -150,18 +151,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (~> 5.1.0)
-  activerecord (~> 5.1.0)
-  activerecord-jdbcsqlite3-adapter (>= 5.0.pre1)
-  bundler (>= 1.1.0)
+  actionmailer (~> 5.2.2)
+  activerecord (~> 5.2.2)
+  activerecord-jdbcsqlite3-adapter (~> 52.1)
+  bundler (~> 2.0.1)
   capybara
-  devise (~> 4.0)
+  devise (~> 4.6)
   devise_invitable!
   mocha
   mongoid
   nokogiri
   rspec-rails
-  sqlite3 (~> 1.3.4)
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.3
+   2.0.1
diff --git a/README.rdoc b/README.rdoc
index 96ae389e..2026b139 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -3,7 +3,7 @@
 
 It adds support to devise[https://github.com/plataformatec/devise] for sending invitations by email (it requires to be authenticated) and accept the invitation setting the password.
 
-It works with Devise >= 4.0
+It works with Devise >= 4.6
 If you want to use devise 3.0.x, you must use 1.2.1 or lower
 If you want to use devise 3.1.x, you must use 1.3.2 or lower
 If you want to use devise >= 3.2, you must use 1.6.1 or lower
diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec
index b263d12b..6ef23a22 100644
--- a/devise_invitable.gemspec
+++ b/devise_invitable.gemspec
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'devise_invitable/version'
 
@@ -15,13 +14,12 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files {app,config,lib}`.split("\n") + %w[LICENSE README.rdoc CHANGELOG.md]
   s.require_path = "lib"
   s.rdoc_options = ["--main", "README.rdoc", "--charset=UTF-8"]
-  s.test_files = `git ls-files test`.split("\n")
+  s.test_files   = `git ls-files test`.split("\n")
 
-  s.required_ruby_version     = '>= 2.1.0'
-  s.required_rubygems_version = '>= 1.3.6'
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_development_dependency('bundler', '>= 1.1.0')
+  s.add_runtime_dependency 'actionmailer', '>= 5.0'
+  s.add_runtime_dependency 'devise', '>= 4.6'
 
-  s.add_runtime_dependency('actionmailer', '>= 4.1.0')
-  s.add_runtime_dependency('devise', '>= 4.0.0')
+  s.add_development_dependency 'bundler', '~> 2.0.1'
 end
diff --git a/gemfiles/Gemfile.devise-4.0 b/gemfiles/Gemfile.devise-4.0
deleted file mode 100644
index 54bb87a1..00000000
--- a/gemfiles/Gemfile.devise-4.0
+++ /dev/null
@@ -1,25 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '..'
-
-group :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
-  end
-
-  platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
-  end
-
-  gem 'devise', '~> 4.0.0'
-  gem 'activerecord', '~> 4.2.7'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
-  gem 'shoulda', '~> 2.11.3'
-  gem 'mocha'
-  gem 'factory_girl_rails'
-  gem 'nokogiri'
-  gem 'rspec-rails'
-end
diff --git a/gemfiles/Gemfile.devise-4.0.lock b/gemfiles/Gemfile.devise-4.0.lock
deleted file mode 100644
index 926e79e8..00000000
--- a/gemfiles/Gemfile.devise-4.0.lock
+++ /dev/null
@@ -1,167 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    devise_invitable (1.7.3)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
-      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (6.0.4)
-    bcrypt (3.1.11)
-    bson (4.3.0)
-    builder (3.2.3)
-    capybara (2.18.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    devise (4.0.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
-      responders
-      warden (~> 1.2.3)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    factory_girl (4.9.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
-      railties (>= 3.0.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    metaclass (0.0.4)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mocha (1.3.0)
-      metaclass (~> 0.0.1)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (5.2.1)
-      activemodel (~> 4.0)
-      mongo (>= 2.4.1, < 3.0.0)
-      origin (~> 2.3)
-      tzinfo (>= 0.3.37)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    origin (2.3.1)
-    orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (1.6.9)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    shoulda (2.11.3)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.2.7)
-  activerecord-jdbcsqlite3-adapter (~> 1.3)
-  bundler (>= 1.1.0)
-  capybara
-  devise (~> 4.0.0)
-  devise_invitable!
-  factory_girl_rails
-  mocha
-  mongoid
-  nokogiri
-  rspec-rails
-  shoulda (~> 2.11.3)
-  sqlite3 (~> 1.3.4)
-
-BUNDLED WITH
-   1.16.1
diff --git a/gemfiles/Gemfile.devise-4.1 b/gemfiles/Gemfile.devise-4.1
deleted file mode 100644
index 01778693..00000000
--- a/gemfiles/Gemfile.devise-4.1
+++ /dev/null
@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '..'
-
-group :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
-  end
-
-  platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
-  end
-
-  gem 'devise', '~> 4.1.0'
-  gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5
-  gem 'activerecord', '~> 4.2.7'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
-  gem 'shoulda', '~> 2.11.3'
-  gem 'mocha'
-  gem 'factory_girl_rails'
-  gem 'nokogiri'
-  gem 'rspec-rails'
-end
diff --git a/gemfiles/Gemfile.devise-4.1.lock b/gemfiles/Gemfile.devise-4.1.lock
deleted file mode 100644
index a34cc40b..00000000
--- a/gemfiles/Gemfile.devise-4.1.lock
+++ /dev/null
@@ -1,170 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    devise_invitable (1.7.3)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
-      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (6.0.4)
-    bcrypt (3.1.11)
-    bson (4.3.0)
-    builder (3.2.3)
-    capybara (2.18.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    devise (4.1.1)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
-      responders
-      warden (~> 1.2.3)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    factory_girl (4.9.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
-      railties (>= 3.0.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    metaclass (0.0.4)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mocha (1.3.0)
-      metaclass (~> 0.0.1)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (5.2.1)
-      activemodel (~> 4.0)
-      mongo (>= 2.4.1, < 3.0.0)
-      origin (~> 2.3)
-      tzinfo (>= 0.3.37)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    origin (2.3.1)
-    orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (1.6.9)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    shoulda (2.11.3)
-    sqlite3 (1.3.13)
-    test_after_commit (1.1.0)
-      activerecord (>= 3.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.2.7)
-  activerecord-jdbcsqlite3-adapter (~> 1.3)
-  bundler (>= 1.1.0)
-  capybara
-  devise (~> 4.1.0)
-  devise_invitable!
-  factory_girl_rails
-  mocha
-  mongoid
-  nokogiri
-  rspec-rails
-  shoulda (~> 2.11.3)
-  sqlite3 (~> 1.3.4)
-  test_after_commit
-
-BUNDLED WITH
-   1.16.1
diff --git a/gemfiles/Gemfile.devise-4.4 b/gemfiles/Gemfile.devise-4.4
deleted file mode 100644
index 0e3a6b54..00000000
--- a/gemfiles/Gemfile.devise-4.4
+++ /dev/null
@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '..'
-
-group :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
-  end
-
-  platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
-  end
-
-  gem 'devise', '~> 4.4.0'
-  gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5
-  gem 'activerecord', '~> 4.2.7'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
-  gem 'shoulda', '~> 2.11.3'
-  gem 'mocha'
-  gem 'factory_girl_rails'
-  gem 'nokogiri'
-  gem 'rspec-rails'
-end
diff --git a/gemfiles/Gemfile.devise-4.4.lock b/gemfiles/Gemfile.devise-4.4.lock
deleted file mode 100644
index 0bf13423..00000000
--- a/gemfiles/Gemfile.devise-4.4.lock
+++ /dev/null
@@ -1,170 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    devise_invitable (1.7.3)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
-      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (6.0.4)
-    bcrypt (3.1.11)
-    bson (4.3.0)
-    builder (3.2.3)
-    capybara (2.18.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    devise (4.4.2)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
-      responders
-      warden (~> 1.2.3)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    factory_girl (4.9.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
-      railties (>= 3.0.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    metaclass (0.0.4)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mocha (1.3.0)
-      metaclass (~> 0.0.1)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (5.2.1)
-      activemodel (~> 4.0)
-      mongo (>= 2.4.1, < 3.0.0)
-      origin (~> 2.3)
-      tzinfo (>= 0.3.37)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    origin (2.3.1)
-    orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (1.6.9)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    shoulda (2.11.3)
-    sqlite3 (1.3.13)
-    test_after_commit (1.1.0)
-      activerecord (>= 3.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.2.7)
-  activerecord-jdbcsqlite3-adapter (~> 1.3)
-  bundler (>= 1.1.0)
-  capybara
-  devise (~> 4.4.0)
-  devise_invitable!
-  factory_girl_rails
-  mocha
-  mongoid
-  nokogiri
-  rspec-rails
-  shoulda (~> 2.11.3)
-  sqlite3 (~> 1.3.4)
-  test_after_commit
-
-BUNDLED WITH
-   1.16.1
diff --git a/gemfiles/Gemfile.rails-4.2 b/gemfiles/Gemfile.rails-4.2
deleted file mode 100644
index a5611f67..00000000
--- a/gemfiles/Gemfile.rails-4.2
+++ /dev/null
@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-group :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0.beta1'
-  end
-
-  platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
-  end
-
-  gem 'devise', '~> 4.0'
-  gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5
-  gem 'activerecord', '~> 4.2.7'
-  gem 'actionmailer', '~> 4.2.7'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
-  gem 'mocha'
-  gem 'factory_girl_rails'
-  gem 'nokogiri'
-  gem 'rspec-rails'
-end
diff --git a/gemfiles/Gemfile.rails-4.2.lock b/gemfiles/Gemfile.rails-4.2.lock
deleted file mode 100644
index 2575ee49..00000000
--- a/gemfiles/Gemfile.rails-4.2.lock
+++ /dev/null
@@ -1,169 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    devise_invitable (1.7.3)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
-      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (6.0.4)
-    bcrypt (3.1.11)
-    bson (4.3.0)
-    builder (3.2.3)
-    capybara (2.18.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    devise (4.4.2)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
-      responders
-      warden (~> 1.2.3)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    factory_girl (4.9.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
-      railties (>= 3.0.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    metaclass (0.0.4)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mocha (1.3.0)
-      metaclass (~> 0.0.1)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (5.2.1)
-      activemodel (~> 4.0)
-      mongo (>= 2.4.1, < 3.0.0)
-      origin (~> 2.3)
-      tzinfo (>= 0.3.37)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    origin (2.3.1)
-    orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (1.6.9)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sqlite3 (1.3.13)
-    test_after_commit (1.1.0)
-      activerecord (>= 3.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionmailer (~> 4.2.7)
-  activerecord (~> 4.2.7)
-  activerecord-jdbcsqlite3-adapter (~> 1.3.0.beta1)
-  bundler (>= 1.1.0)
-  capybara
-  devise (~> 4.0)
-  devise_invitable!
-  factory_girl_rails
-  mocha
-  mongoid
-  nokogiri
-  rspec-rails
-  sqlite3 (~> 1.3.4)
-  test_after_commit
-
-BUNDLED WITH
-   1.16.1
diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0
index 85c937e4..9269b0d7 100644
--- a/gemfiles/Gemfile.rails-5.0
+++ b/gemfiles/Gemfile.rails-5.0
@@ -1,25 +1,25 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: '..'
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 5.0.pre1'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1'
   end
 
   platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
+    gem 'sqlite3', '~> 1.3.6'
   end
 
-  gem 'devise', '~> 4.0'
-  gem 'activerecord', '~> 5.0.0'
-  gem 'actionmailer', '~> 5.0.0'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
+  gem 'actionmailer', '~> 5.0'
+  gem 'activerecord', '~> 5.0'
+  gem 'capybara'
+  gem 'devise', '~> 4.6'
   gem 'mocha'
-  gem 'factory_girl_rails'
+  gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master'
   gem 'nokogiri'
   gem 'rspec-rails'
+  gem 'shoulda'
 end
+
diff --git a/gemfiles/Gemfile.rails-5.0.lock b/gemfiles/Gemfile.rails-5.0.lock
index 26abca34..54a392ce 100644
--- a/gemfiles/Gemfile.rails-5.0.lock
+++ b/gemfiles/Gemfile.rails-5.0.lock
@@ -1,161 +1,164 @@
 PATH
   remote: ..
   specs:
-    devise_invitable (1.7.4)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
+    devise_invitable (1.7.5)
+      actionmailer (>= 5.0)
+      devise (~> 4.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (5.0.6)
-      actionpack (= 5.0.6)
-      actionview (= 5.0.6)
-      activejob (= 5.0.6)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.6)
-      actionview (= 5.0.6)
-      activesupport (= 5.0.6)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.6)
-      activesupport (= 5.0.6)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.6)
-      activesupport (= 5.0.6)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.6)
-      activesupport (= 5.0.6)
-    activerecord (5.0.6)
-      activemodel (= 5.0.6)
-      activesupport (= 5.0.6)
-      arel (~> 7.0)
-    activesupport (5.0.6)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (7.1.4)
-    bcrypt (3.1.11)
-    bson (4.3.0)
+    arel (9.0.0)
+    bcrypt (3.1.12)
+    bson (4.4.2)
     builder (3.2.3)
-    capybara (2.18.0)
+    capybara (3.13.2)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    devise (4.4.2)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
-    erubis (2.7.0)
-    factory_girl (4.9.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
-      railties (>= 3.0.0)
-    globalid (0.4.1)
+    erubi (1.8.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.9.5)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.0)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     metaclass (0.0.4)
-    method_source (0.9.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mocha (1.3.0)
+    mocha (1.8.0)
       metaclass (~> 0.0.1)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (6.1.1)
-      activemodel (~> 5.0)
-      mongo (>= 2.4.1, < 3.0.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    mongo (2.7.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (7.0.2)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (2.0.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.6)
-      actionpack (= 5.0.6)
-      activesupport (= 5.0.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.3.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    shoulda (3.6.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (~> 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (3.1.3)
+      activesupport (>= 4.0.0)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (~> 5.0.0)
-  activerecord (~> 5.0.0)
-  activerecord-jdbcsqlite3-adapter (>= 5.0.pre1)
-  bundler (>= 1.1.0)
+  actionmailer (~> 5.0)
+  activerecord (~> 5.0)
+  activerecord-jdbcsqlite3-adapter (~> 52.1)
+  bundler (~> 2.0.1)
   capybara
-  devise (~> 4.0)
+  devise (~> 4.6)
   devise_invitable!
-  factory_girl_rails
   mocha
   mongoid
   nokogiri
   rspec-rails
-  sqlite3 (~> 1.3.4)
+  shoulda
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.1
+   2.0.1
diff --git a/gemfiles/Gemfile.rails-5.1 b/gemfiles/Gemfile.rails-5.1
new file mode 100644
index 00000000..860fe39b
--- /dev/null
+++ b/gemfiles/Gemfile.rails-5.1
@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec path: '..'
+
+group :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1'
+  end
+
+  platforms :ruby do
+    gem 'sqlite3', '~> 1.3.6'
+  end
+
+  gem 'actionmailer', '~> 5.1'
+  gem 'activerecord', '~> 5.1'
+  gem 'capybara'
+  gem 'devise', '~> 4.6'
+  gem 'mocha'
+  gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master'
+  gem 'nokogiri'
+  gem 'rspec-rails'
+  gem 'shoulda'
+end
+
diff --git a/gemfiles/Gemfile.rails-5.1.lock b/gemfiles/Gemfile.rails-5.1.lock
new file mode 100644
index 00000000..14745343
--- /dev/null
+++ b/gemfiles/Gemfile.rails-5.1.lock
@@ -0,0 +1,164 @@
+PATH
+  remote: ..
+  specs:
+    devise_invitable (1.7.5)
+      actionmailer (>= 5.0)
+      devise (~> 4.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
+      globalid (>= 0.3.6)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    bcrypt (3.1.12)
+    bson (4.4.2)
+    builder (3.2.3)
+    capybara (3.13.2)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    devise (4.6.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
+    diff-lcs (1.3)
+    erubi (1.8.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.5.3)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    metaclass (0.0.4)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mocha (1.8.0)
+      metaclass (~> 0.0.1)
+    mongo (2.7.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (7.0.2)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    orm_adapter (0.5.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.3.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    shoulda (3.6.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (~> 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (3.1.3)
+      activesupport (>= 4.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionmailer (~> 5.1)
+  activerecord (~> 5.1)
+  activerecord-jdbcsqlite3-adapter (~> 52.1)
+  bundler (~> 2.0.1)
+  capybara
+  devise (~> 4.6)
+  devise_invitable!
+  mocha
+  mongoid
+  nokogiri
+  rspec-rails
+  shoulda
+  sqlite3 (~> 1.3.6)
+
+BUNDLED WITH
+   2.0.1
diff --git a/gemfiles/Gemfile.rails-5.2 b/gemfiles/Gemfile.rails-5.2
index d6f82924..0488b23e 100644
--- a/gemfiles/Gemfile.rails-5.2
+++ b/gemfiles/Gemfile.rails-5.2
@@ -1,25 +1,25 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: '..'
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 5.0.pre1'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1'
   end
 
   platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
+    gem 'sqlite3', '~> 1.3.6'
   end
 
-  gem 'devise', '~> 4.0'
-  gem 'activerecord', '~> 5.2.0'
-  gem 'actionmailer', '~> 5.2.0'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
+  gem 'actionmailer', '~> 5.2'
+  gem 'activerecord', '~> 5.2'
+  gem 'capybara'
+  gem 'devise', '~> 4.6'
   gem 'mocha'
-  gem 'factory_girl_rails'
+  gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master'
   gem 'nokogiri'
   gem 'rspec-rails'
+  gem 'shoulda'
 end
+
diff --git a/gemfiles/Gemfile.rails-5.2.lock b/gemfiles/Gemfile.rails-5.2.lock
index c29b03c4..4dd42681 100644
--- a/gemfiles/Gemfile.rails-5.2.lock
+++ b/gemfiles/Gemfile.rails-5.2.lock
@@ -1,161 +1,164 @@
 PATH
   remote: ..
   specs:
-    devise_invitable (1.7.4)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
+    devise_invitable (1.7.5)
+      actionmailer (>= 5.0)
+      devise (~> 4.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activesupport (5.2.0)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     arel (9.0.0)
-    bcrypt (3.1.11)
-    bson (4.3.0)
+    bcrypt (3.1.12)
+    bson (4.4.2)
     builder (3.2.3)
-    capybara (3.0.3)
+    capybara (3.13.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      xpath (~> 3.0)
-    concurrent-ruby (1.0.5)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.4)
     crass (1.0.4)
-    devise (4.4.3)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
-    erubi (1.7.1)
-    factory_girl (4.9.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
-      railties (>= 3.0.0)
-    globalid (0.4.1)
+    erubi (1.8.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.0.1)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     metaclass (0.0.4)
-    method_source (0.9.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mocha (1.5.0)
+    mocha (1.8.0)
       metaclass (~> 0.0.1)
-    mongo (2.5.3)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (7.0.1)
+    mongo (2.7.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (7.0.2)
       activemodel (>= 5.1, < 6.0.0)
       mongo (>= 2.5.1, < 3.0.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (2.0.5)
-    rack-test (1.0.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.3.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    shoulda (3.6.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (~> 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (3.1.3)
+      activesupport (>= 4.0.0)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (~> 5.2.0)
-  activerecord (~> 5.2.0)
-  activerecord-jdbcsqlite3-adapter (>= 5.0.pre1)
-  bundler (>= 1.1.0)
+  actionmailer (~> 5.2)
+  activerecord (~> 5.2)
+  activerecord-jdbcsqlite3-adapter (~> 52.1)
+  bundler (~> 2.0.1)
   capybara
-  devise (~> 4.0)
+  devise (~> 4.6)
   devise_invitable!
-  factory_girl_rails
   mocha
   mongoid
   nokogiri
   rspec-rails
-  sqlite3 (~> 1.3.4)
+  shoulda
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.1
+   2.0.1
diff --git a/gemfiles/Gemfile.rails-master b/gemfiles/Gemfile.rails-master
index e0f41b18..8652ffd8 100644
--- a/gemfiles/Gemfile.rails-master
+++ b/gemfiles/Gemfile.rails-master
@@ -1,25 +1,25 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-gemspec :path => '..'
+gemspec path: '..'
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 5.0.pre1'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1'
   end
 
   platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
+    gem 'sqlite3', '~> 1.3.6'
   end
 
-  gem 'devise', '~> 4.0'
-  #gem 'activerecord'
-  gem 'rails', github: 'rails/rails'
-  gem "mongoid"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
-  gem 'shoulda', '~> 2.11.3'
+  gem 'actionmailer', github: 'rails/rails'
+  gem 'activerecord', github: 'rails/rails'
+  gem 'capybara'
+  gem 'devise', '~> 4.6'
   gem 'mocha'
-  gem 'factory_girl_rails'
+  gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master'
   gem 'nokogiri'
   gem 'rspec-rails'
+  gem 'shoulda'
 end
+
diff --git a/gemfiles/Gemfile.rails-master.lock b/gemfiles/Gemfile.rails-master.lock
index b6565097..0013f5cf 100644
--- a/gemfiles/Gemfile.rails-master.lock
+++ b/gemfiles/Gemfile.rails-master.lock
@@ -1,206 +1,169 @@
 GIT
-  remote: git://github.com/rails/rails.git
-  revision: 057c8f257d57f99a6bb80c59429cac2aab3422da
+  remote: https://github.com/rails/rails.git
+  revision: a333ba3f7f24dff3c50c7cf26a2fe2caa748a851
   specs:
-    actioncable (5.1.0.alpha)
-      actionpack (= 5.1.0.alpha)
-      nio4r (~> 1.2)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.0.alpha)
-      actionpack (= 5.1.0.alpha)
-      actionview (= 5.1.0.alpha)
-      activejob (= 5.1.0.alpha)
+    actionmailer (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      actionview (= 6.0.0.beta1)
+      activejob (= 6.0.0.beta1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.0.alpha)
-      actionview (= 5.1.0.alpha)
-      activesupport (= 5.1.0.alpha)
+    actionpack (6.0.0.beta1)
+      actionview (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.0.alpha)
-      activesupport (= 5.1.0.alpha)
+    actionview (6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.1.0.alpha)
-      activesupport (= 5.1.0.alpha)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       globalid (>= 0.3.6)
-    activemodel (5.1.0.alpha)
-      activesupport (= 5.1.0.alpha)
-    activerecord (5.1.0.alpha)
-      activemodel (= 5.1.0.alpha)
-      activesupport (= 5.1.0.alpha)
-      arel (~> 7.0)
-    activesupport (5.1.0.alpha)
+    activemodel (6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
+    activerecord (6.0.0.beta1)
+      activemodel (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
+    activesupport (6.0.0.beta1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.1.0.alpha)
-      actioncable (= 5.1.0.alpha)
-      actionmailer (= 5.1.0.alpha)
-      actionpack (= 5.1.0.alpha)
-      actionview (= 5.1.0.alpha)
-      activejob (= 5.1.0.alpha)
-      activemodel (= 5.1.0.alpha)
-      activerecord (= 5.1.0.alpha)
-      activesupport (= 5.1.0.alpha)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.0.alpha)
-      sprockets-rails (>= 2.0.0)
-    railties (5.1.0.alpha)
-      actionpack (= 5.1.0.alpha)
-      activesupport (= 5.1.0.alpha)
+      zeitwerk (~> 1.3)
+    railties (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.20.3, < 2.0)
 
 PATH
   remote: ..
   specs:
-    devise_invitable (1.7.1)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
+    devise_invitable (1.7.5)
+      actionmailer (>= 5.0)
+      devise (~> 4.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activerecord-jdbc-adapter (5.0.pre1)
-      activerecord (>= 2.2)
-    activerecord-jdbcsqlite3-adapter (5.0.pre1)
-      activerecord-jdbc-adapter (~> 5.0.pre1)
-      jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
-    bcrypt (3.1.11)
-    bcrypt (3.1.11-java)
-    bson (4.2.0)
-    bson (4.2.0-java)
-    builder (3.2.2)
-    capybara (2.12.0)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    bcrypt (3.1.12)
+    bson (4.4.2)
+    builder (3.2.3)
+    capybara (3.13.2)
       addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    concurrent-ruby (1.0.3)
-    concurrent-ruby (1.0.3-java)
-    devise (4.1.0)
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    factory_girl (4.8.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
-      railties (>= 3.0.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    jdbc-sqlite3 (3.8.11.2)
-    loofah (2.0.3)
+    diff-lcs (1.3)
+    erubi (1.8.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.5.3)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    mocha (1.1.0)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mocha (1.8.0)
       metaclass (~> 0.0.1)
-    mongo (2.4.0)
-      bson (~> 4.2.0)
-    mongoid (6.0.3)
-      activemodel (~> 5.0)
-      mongo (~> 2.3)
-    nio4r (1.2.1)
-    nio4r (1.2.1-java)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    nokogiri (1.6.8.1-java)
+    mongo (2.7.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (7.0.2)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    public_suffix (2.0.5)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    rake (12.0.0)
-    responders (2.2.0)
-      railties (>= 4.2.0, < 5.1)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    rake (12.3.2)
+    regexp_parser (1.3.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.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)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.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)
-    shoulda (2.11.3)
-    sprockets (3.7.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    shoulda (3.6.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (~> 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (3.1.3)
+      activesupport (>= 4.0.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    tzinfo (1.2.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    warden (1.2.6)
-      rack (>= 1.0)
-    websocket-driver (0.6.4)
-      websocket-extensions (>= 0.1.0)
-    websocket-driver (0.6.4-java)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (1.3.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcsqlite3-adapter (>= 5.0.pre1)
-  bundler (>= 1.1.0)
+  actionmailer!
+  activerecord!
+  activerecord-jdbcsqlite3-adapter (~> 52.1)
+  bundler (~> 2.0.1)
   capybara
-  devise (~> 4.0)
+  devise (~> 4.6)
   devise_invitable!
-  factory_girl_rails
   mocha
   mongoid
   nokogiri
-  rails!
   rspec-rails
-  shoulda (~> 2.11.3)
-  sqlite3 (~> 1.3.4)
+  shoulda
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.13.7
+   2.0.1
diff --git a/lib/generators/active_record/devise_invitable_generator.rb b/lib/generators/active_record/devise_invitable_generator.rb
index 2a366ed6..daad471e 100644
--- a/lib/generators/active_record/devise_invitable_generator.rb
+++ b/lib/generators/active_record/devise_invitable_generator.rb
@@ -10,7 +10,7 @@ def copy_devise_migration
       end
 
       def migration_version
-        if Rails.version.start_with? '5.'
+        if Rails::VERSION::MAJOR >= 5
           "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
         end
       end
diff --git a/test/models/invitable_test.rb b/test/models/invitable_test.rb
index 60f4dd5b..2d5c237d 100644
--- a/test/models/invitable_test.rb
+++ b/test/models/invitable_test.rb
@@ -165,8 +165,8 @@ def setup
   end
 
   test 'should allow non-string columns for invite key' do
-    User.stubs(:invite_key).returns(email: Devise.email_regexp, profile_id: :present?.to_proc, active: true)
-    user = User.invite!(email: 'valid@email.com', profile_id: 1, active: true)
+    User.stubs(:invite_key).returns(email: Devise.email_regexp, profile_id: :present?.to_proc)
+    user = User.invite!(email: 'valid@email.com', profile_id: 1)
     assert_predicate user, :persisted?
     assert_empty user.errors
   end
diff --git a/test/rails_app/config/credentials.yml.enc b/test/rails_app/config/credentials.yml.enc
new file mode 100644
index 00000000..8a33703e
--- /dev/null
+++ b/test/rails_app/config/credentials.yml.enc
@@ -0,0 +1 @@
+d19hQaf4kv/ajU/ABKNej/dqmAPNDfiZSBnGbsfBAs3oLxNVvuJm8TJ1bUMaZ2s2hcDSZRQKHtJqcDfBMrN0egkVPYaoGvYOZ7XzU2v9O1xhEwI9wFO+0yWDDTDxC8UJr60s+Gh++jQMCxTZ+Yhl5Od8d2rqoMcuhZrGhKOuvPBARyyDSN2/Q0rvIYO+OGFFkwTK+HD2ccRzYWBNH8DBMSeh8ja83BykLE0fNL9tPmYKK1gnEsME7AN8UN/AmFqFPLOX9otfQ0imwLhnsWMYPxqfJoqvgEpuAywPW3n3nIpzX1/dwpDrHnm5tbsIwgctlq4Q2DFu6dc7H3Pzjx6INWCB5pr97zH84+gHjYuoLafUxGEN8zbxFyrPe0Pm8jPi5qfJP3HlaweFR/XhNI1s+pl2WZQqAEkjMp0h--z4CX57AIHm+gPVBc--UBpBryKnypoqwmbLDIqa8Q==
\ No newline at end of file
diff --git a/test/rails_app/config/initializers/secret_token.rb b/test/rails_app/config/initializers/secret_token.rb
deleted file mode 100644
index 3e3abfb6..00000000
--- a/test/rails_app/config/initializers/secret_token.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-RailsApp::Application.config.secret_token = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607'
diff --git a/test/rails_app/config/master.key b/test/rails_app/config/master.key
new file mode 100644
index 00000000..6f82ac39
--- /dev/null
+++ b/test/rails_app/config/master.key
@@ -0,0 +1 @@
+698ff206d79207132705d29c6a1c90b1
\ No newline at end of file