14988: Allows units & functionals tests to run.

The 'nulldb' database adapter was having issues with rails 5.0. The solution
was to fork the project and apply a pending PR from January.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index a4c5d0709f4137720f8b4edba1ccaa8280f051f0..82e407d31de9929d73323f86fb72752f8f52b721 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -7,7 +7,7 @@ source 'https://rubygems.org'
 gem 'rails', '~> 5.0.0'
 gem 'arvados', '>= 0.1.20150511150219'
 
-gem 'activerecord-nulldb-adapter'
+gem 'activerecord-nulldb-adapter', git: 'https://github.com/curoverse/nulldb'
 gem 'multi_json'
 gem 'oj'
 gem 'sass'

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 753f28e0843705b2c67b0af58cab9ec17c093a4c..d32cdf62060ba646dcc795732dfb2175e1fcc234 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/curoverse/nulldb
+  revision: d8e0073b665acdd2537c5eb15178a60f02f4b413
+  specs:
+    activerecord-nulldb-adapter (0.3.9)
+      activerecord (>= 2.0.0)
+
 GIT
   remote: https://github.com/curoverse/themes_for_rails
   revision: ddf6e592b3b6493ea0c2de7b5d3faa120ed35be0
@@ -41,8 +48,6 @@ GEM
       activemodel (= 5.0.7.2)
       activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activerecord-nulldb-adapter (0.3.9)
-      activerecord (>= 2.0.0)
     activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -306,7 +311,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  activerecord-nulldb-adapter
+  activerecord-nulldb-adapter!
   andand
   angularjs-rails (~> 1.3.8)
   arvados (>= 0.1.20150511150219)

diff --git a/apps/workbench/test/functional/.gitkeep b/apps/workbench/test/functional/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/apps/workbench/test/models/.gitkeep b/apps/workbench/test/models/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29