mutant 0.10.9 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d4849ffe2057370e38c3718afe4cbbfcbfaf76b058c4c5364ff2a7475a3122
-  data.tar.gz: 6e9abc09f95b929c6ee5b1f09745aa7ce01cc66ab70aaa3e044f2da5b897ce25
+  metadata.gz: d336eb88315a70aeeced6841c99718700ebb0694bb524d9428a31c0486c7444e
+  data.tar.gz: e2ad192ce138f10cf6e45aea0c11ea3d5cb83b5fa5608703c78b9421269b4e7d
 SHA512:
-  metadata.gz: '050159a447e4f328e9283cea9785dc08bd51d6132995ff9ecda4cdfbda08f665f8294607f5eeaf390e9b3a069ae69dab675fc2767b1300973ec9bfa2b918b70a'
-  data.tar.gz: 582384118f7e8df7091280f6bc78e6d6f95f612f28a0892637d1e1a845c93754df29f5e463e8a1a69ca5f85ed95e666f82ab4ac957bf3a896d3f34fb26a5693b
+  metadata.gz: b8557df3118320ad1a2b0dc661d78dde58655f164c902f6c07a4657919980cfcc4ddd8e57c2a303b9ecd1c460549a9953e72dcc12d9df34fbbbcfc23a4458d6f
+  data.tar.gz: 0404212caaba99c3836db6c59930ba857fc554f9a02af7d8d0c6bace9732337cab0b2ecd3df258ab802c18f99546941eaec888125c5bbbe7fc59bf1c9f79059b

data/lib/mutant/cli/command/run.rb

@@ -49,7 +49,7 @@ module Mutant
         end
 
         def expand(file_config)
-          @config = @config.merge(file_config)
+          @config = file_config.merge(@config)
         end
 
         def soft_fail(result)

data/lib/mutant/config.rb

@@ -71,12 +71,12 @@ module Mutant
     def merge(other)
       other.with(
         fail_fast:        fail_fast || other.fail_fast,
-        includes:         other.includes + includes,
+        includes:         includes + other.includes,
         jobs:             other.jobs || jobs,
         integration:      other.integration || integration,
         mutation_timeout: other.mutation_timeout || mutation_timeout,
         matcher:          matcher.merge(other.matcher),
-        requires:         other.requires + requires,
+        requires:         requires + other.requires,
         zombie:           zombie || other.zombie
       )
     end

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.10.9'
+  VERSION = '0.10.10'
 end # Mutant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type