From e92ba607eb2f38a9f8a3740ecf6c08aea1429a25 Mon Sep 17 00:00:00 2001
From: Markus Schirp <mbj@schirp-dso.com>
Date: Sun, 24 Jan 2016 00:55:00 +0000
Subject: [PATCH] Fix devtools API & external gem changes

* Followup with devtools 0.1.3 that fixes some behavior to be more strict
* Followup with ast-0.2.2 that changes #inspect
---
 config/devtools.yml                                         | 2 +-
 mutant.gemspec                                              | 4 ++--
 spec/spec_helper.rb                                         | 1 -
 .../mutant/reporter/cli/printer/mutation_result_spec.rb     | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/devtools.yml b/config/devtools.yml
index ee4acca3..d8c11cf7 100644
--- a/config/devtools.yml
+++ b/config/devtools.yml
@@ -1,2 +1,2 @@
 ---
-unit_test_timeout: 10
+unit_test_timeout: 10.0
diff --git a/mutant.gemspec b/mutant.gemspec
index d7901ea9..c2e60b72 100644
--- a/mutant.gemspec
+++ b/mutant.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('ast',           '~> 2.1')
   gem.add_runtime_dependency('diff-lcs',      '~> 1.2')
   gem.add_runtime_dependency('parallel',      '~> 1.3')
-  gem.add_runtime_dependency('morpher',       '~> 0.2.5')
+  gem.add_runtime_dependency('morpher',       '~> 0.2.6')
   gem.add_runtime_dependency('procto',        '~> 0.0.2')
   gem.add_runtime_dependency('abstract_type', '~> 0.0.7')
   gem.add_runtime_dependency('unparser',      '~> 0.2.4')
@@ -36,7 +36,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('anima',         '~> 0.3.0')
   gem.add_runtime_dependency('concord',       '~> 0.1.5')
 
-  gem.add_development_dependency('devtools', '~> 0.1.1')
+  gem.add_development_dependency('devtools', '~> 0.1.3')
   gem.add_development_dependency('bundler',  '~> 1.10')
   gem.add_development_dependency('ffi',      '~> 1.9.6')
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5ebf7960..8c919e59 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,7 +26,6 @@ require 'devtools/spec_helper'
 require 'unparser/cli'
 require 'mutant'
 require 'mutant/meta'
-Devtools.init_spec_helper
 
 $LOAD_PATH << File.join(TestApp.root, 'lib')
 
diff --git a/spec/unit/mutant/reporter/cli/printer/mutation_result_spec.rb b/spec/unit/mutant/reporter/cli/printer/mutation_result_spec.rb
index f1ffd86c..a95d0dad 100644
--- a/spec/unit/mutant/reporter/cli/printer/mutation_result_spec.rb
+++ b/spec/unit/mutant/reporter/cli/printer/mutation_result_spec.rb
@@ -50,11 +50,11 @@ RSpec.describe Mutant::Reporter::CLI::Printer::MutationResult do
             Original unparsed source:
             super
             Original AST:
-            (lvar :super)
+            s(:lvar, :super)
             Mutated unparsed source:
             super
             Mutated AST:
-            (zsuper)
+            s(:zsuper)
             -----------------------
           REPORT
         end
@@ -73,7 +73,7 @@ RSpec.describe Mutant::Reporter::CLI::Printer::MutationResult do
           Original code was inserted unmutated. And the test did NOT PASS.
           Your tests do not pass initially or you found a bug in mutant / unparser.
           Subject AST:
-          (true)
+          s(:true)
           Unparsed Source:
           true
           Test Result: