Merge pull request #101 from DigitalCurationCentre/deploy/uat

Merge UAT changes for Deploy

Author: xsrust

Gemfile

@@ -53,7 +53,9 @@ group :puma do
 end
 
 # Bit fields for ActiveRecord (https://github.com/pboling/flag_shih_tzu)
-gem 'flag_shih_tzu'  # Allows for bitfields in activereccord
+gem 'flag_shih_tzu', '~> 0.3.23' # Allows for bitfields in activereccord
+# Pinned here because we're using a private method in Role.rb
+# if this gets updated, check this method still exists
 
 # ------------------------------------------------
 #    JSON DSL - USED BY API
@@ -64,7 +66,7 @@ gem 'jbuilder', '~> 2.6.0'
 #    USERS
 # devise for user authentication
 # Flexible authentication solution for Rails with Warden (https://github.com/plataformatec/devise)
-gem 'devise'
+gem 'devise', ">= 4.7.1"
 
 # An invitation strategy for Devise (https://github.com/scambra/devise_invitable)
 gem 'devise_invitable'
@@ -149,11 +151,14 @@ gem 'wkhtmltopdf-binary'
 gem 'wicked_pdf', '~> 1.1.0'
 
 # This simple gem allows you to create MS Word docx documents from simple html documents. This makes it easy to create dynamic reports and forms that can be downloaded by your users as simple MS Word docx files. (http://github.com/karnov/htmltoword)
-gem 'htmltoword'
+gem 'htmltoword', '1.1.0'
 
 # A feed fetching and parsing library (http://feedjira.com)
 gem 'feedjira'
 
+# Filename sanitization for Ruby. This is useful when you generate filenames for downloads from user input
+gem 'zaru'
+
 # ------------------------------------------------
 # INTERNATIONALIZATION
 # Simple FastGettext Rails integration. (http://github.com/grosser/gettext_i18n_rails)
@@ -236,11 +241,7 @@ group :test do
   # Automatically create snapshots when Cucumber steps fail with Capybara and Rails (http://github.com/mattheworiordan/capybara-screenshot)
   gem "capybara-screenshot"
 
-  # The next generation developer focused tool for automated testing of webapps (https://github.com/SeleniumHQ/selenium)
-  gem "selenium-webdriver", "~> 3.14"
-
-  # Easy installation and use of chromedriver. (https://github.com/flavorjones/chromedriver-helper)
-  gem "chromedriver-helper", ">= 1.2.0"
+  gem 'webdrivers', '~> 3.0'
 
   gem "rspec-collection_matchers"