[ARVADOS] updated: 1.3.0-563-g728522fbc

Git user git at public.curoverse.com
Wed Mar 27 18:16:47 UTC 2019


Summary of changes:
 apps/workbench/.gitignore                    | 2 ++
 services/api/test/integration/groups_test.rb | 2 +-
 services/api/test/test_helper.rb             | 4 ++++
 services/api/test/unit/arvados_model_test.rb | 5 ++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

       via  728522fbc034711e87954bcbdcfa4a3bf7c470e3 (commit)
       via  392d1f416f8d6e0ca74984376b57c809f7d1e0a4 (commit)
       via  041378345708e781b5b3a4a618e9c4848e465218 (commit)
      from  8ba20b331fc99252acc29161902017ab98c6a979 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 728522fbc034711e87954bcbdcfa4a3bf7c470e3
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Mar 27 15:09:52 2019 -0300

    14873: Adds headers to controller tests' requests.
    
    API server logs used to report 'format: html' when running functional tests.
    With these additions, it now reports 'json', but this is not enough to fix
    the issue about nested arrays being flattened when running tests.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index 25c7c3ef2..fa42a32dd 100644
--- a/apps/workbench/.gitignore
+++ b/apps/workbench/.gitignore
@@ -7,6 +7,8 @@
 /tmp
 .byebug_history
 
+package-lock.json
+
 /config/.secret_token
 /config/initializers/secret_token.rb
 
diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index ffd50d808..710fb2bc4 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -152,6 +152,10 @@ end
 class ActionController::TestCase
   setup do
     @test_counter = 0
+    # Trying this:
+    # https://stackoverflow.com/questions/44119273/rails-5-1-minitest-flattens-array-of-arrays-in-params
+    self.request.headers['Accept'] = 'application/json'
+    self.request.headers['Content-Type'] = 'application/json'
   end
 
   def check_counter action

commit 392d1f416f8d6e0ca74984376b57c809f7d1e0a4
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Mar 27 15:07:09 2019 -0300

    14873: Gets rid of yet another deprecation warning.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/test/integration/groups_test.rb b/services/api/test/integration/groups_test.rb
index 3789ac7fb..3a59aff9a 100644
--- a/services/api/test/integration/groups_test.rb
+++ b/services/api/test/integration/groups_test.rb
@@ -142,7 +142,7 @@ class NonTransactionalGroupsTest < ActionDispatch::IntegrationTest
   # This is needed because nested transactions share the connection pool, so
   # one thread is locked while trying to talk to the database, until the other
   # one finishes.
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   teardown do
     # Explicitly reset the database after each test.

commit 041378345708e781b5b3a4a618e9c4848e465218
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Mar 27 15:02:11 2019 -0300

    14873: Skips indexes which 'columns' attribute isn't an Array.
    
    ActiveRecord::Base.connection.indexes(table) didn't seem to return these
    previous to rails 5.0 upgrade.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/test/unit/arvados_model_test.rb b/services/api/test/unit/arvados_model_test.rb
index d07027721..3645d0507 100644
--- a/services/api/test/unit/arvados_model_test.rb
+++ b/services/api/test/unit/arvados_model_test.rb
@@ -152,7 +152,10 @@ class ArvadosModelTest < ActiveSupport::TestCase
 
         indexes = ActiveRecord::Base.connection.indexes(table)
         search_index_by_columns = indexes.select do |index|
-          index.columns.sort == search_index_columns.sort
+          # After rails 5.0 upgrade, AR::Base.connection.indexes() started to include
+          # GIN indexes, with its 'columns' attribute being a String like
+          # 'to_tsvector(...)'
+          index.columns.is_a?(Array) ? index.columns.sort == search_index_columns.sort : false
         end
         search_index_by_name = indexes.select do |index|
           index.name == "#{table}_search_index"

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list