Merge 7ec501b into 8ca27b8

samvera · Oct 4, 2018 · 4180e93 · 4180e93
2 parents 8ca27b8 + 7ec501b
commit 4180e93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/importer/factory/object_factory.rb b/lib/importer/factory/object_factory.rb
@@ -34,7 +34,11 @@ def update
       end
 
       def create_attributes
-        { collection_type: collection_type }.merge(transform_attributes)
+        if klass == Collection
+          { collection_type: collection_type }.merge(transform_attributes)
+        else
+          transform_attributes
+        end
       end
 
       def update_attributes

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -55,11 +55,8 @@
   config.run_all_when_everything_filtered = true
 
   # only run aws tests from CI (or w/ `--tag aws`) and only run it on the main repo, since that
-  # is where the valid aws keys live. TRAVIS_PULL_REQUEST_SLUG is "" when the job is a push job
-  unless ENV['CI'] &&
-         (ENV['TRAVIS_PULL_REQUEST_SLUG'].match('samvera-labs/hyku') || ENV['TRAVIS_PULL_REQUEST_SLUG'].blank?)
-    config.filter_run_excluding(aws: true)
-  end
+  # is where the valid aws keys live
+  config.filter_run_excluding(aws: true) unless ENV['CI'] && ENV['TRAVIS_PULL_REQUEST_SLUG'].match('samvera-labs/hyku')
 
   # Allows RSpec to persist some state between runs in order to support
   # the `--only-failures` and `--next-failure` CLI options. We recommend