Merge pull request qltysh#490 from codeclimate/update_test_reporter

mrb · web-flow · commit 56c4c8b6bc62 · 2016-09-22T11:52:52.000-04:00
Update to use new style ruby test reporter
diff --git a/Gemfile b/Gemfile
@@ -3,8 +3,9 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
+  gem "simplecov"
   gem "rake"
   gem "rspec"
   gem "rspec_junit_formatter"
-  gem "codeclimate-test-reporter", require: nil
+  gem "codeclimate-test-reporter", "1.0.0.pre.rc1"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -20,8 +20,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     builder (3.2.2)
-    codeclimate-test-reporter (0.4.8)
-      simplecov (>= 0.7.1, < 1.0.0)
+    codeclimate-test-reporter (1.0.0.pre.rc1)
     codeclimate-yaml (0.9.0)
       activesupport
       secure_string
@@ -59,7 +58,7 @@ GEM
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
     secure_string (1.3.3)
-    simplecov (0.10.0)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -75,10 +74,11 @@ PLATFORMS
 
 DEPENDENCIES
   codeclimate!
-  codeclimate-test-reporter
+  codeclimate-test-reporter (= 1.0.0.pre.rc1)
   rake
   rspec
   rspec_junit_formatter
+  simplecov
 
 BUNDLED WITH
    1.12.5
diff --git a/Makefile b/Makefile
@@ -14,16 +14,16 @@ test: image
 
 citest:
 	docker run \
+	  --entrypoint sh \
 	  --env CIRCLECI=$(CIRCLECI) \
 	  --env CIRCLE_BUILD_NUM=$(CIRCLE_BUILD_NUM) \
 	  --env CIRCLE_BRANCH=$(CIRCLE_BRANCH) \
 	  --env CIRCLE_SHA1=$(CIRCLE_SHA1) \
 	  --env CODECLIMATE_REPO_TOKEN=$(CODECLIMATE_REPO_TOKEN) \
-	  --entrypoint bundle \
 	  --volume $(PWD)/.git:/usr/src/app/.git:ro \
 	  --volume /var/run/docker.sock:/var/run/docker.sock \
 	  --volume $(CIRCLE_TEST_REPORTS):/usr/src/app/spec/reports \
-	  codeclimate/codeclimate exec rake spec:all spec:benchmark
+	  codeclimate/codeclimate -c "bundle exec rake spec:all && bundle exec codeclimate-test-reporter && bundle exec rake spec:benchmark"
 
 install:
 	bin/check
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,5 +1,7 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require "simplecov"
+SimpleCov.start do
+  add_filter "/spec/"
+end
 
 require "cc/cli"
 require "cc/yaml"
