Merge branch 'master' into 6465-optimize-workbench-integration-tests

[arvados.git] / apps / workbench / test / unit / arvados_base_test.rb

diff --git a/apps/workbench/test/unit/arvados_base_test.rb b/apps/workbench/test/unit/arvados_base_test.rb
index 5b16cd621eaf5ad15bbd8fb68899b2bb8a9bf4c4..e9ac4f82a5b59d6ae85e6767e43e700093b9e0a1 100644 (file)
--- a/apps/workbench/test/unit/arvados_base_test.rb
+++ b/apps/workbench/test/unit/arvados_base_test.rb
@@ -31,7 +31,13 @@ class ArvadosBaseTest < ActiveSupport::TestCase
         filter([['uuid','=',fixture['uuid']]]).
         select(['uuid']).
         first
-      assert_equal nil, c.properties
+      if 'MissingAttribute check is re-enabled' == true
+        assert_raises ActiveModel::MissingAttributeError do
+          c.properties
+        end
+      else
+        assert_equal({}, c.properties)
+      end
 
       got_query = nil
       stub_api_calls