From 92b48ac42e84eb4c113bb3fb362f83b51282c99f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 26 Jan 2017 12:01:54 +0000 Subject: [PATCH] brew-cask-tests: import Rakefile logic. This avoids a `rake` dependency in the Gemfile and an unnecessary shell out. --- Library/Homebrew/cask/Rakefile | 17 ----------------- Library/Homebrew/cask/cmd/brew-cask-tests.rb | 5 ++++- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 Library/Homebrew/cask/Rakefile diff --git a/Library/Homebrew/cask/Rakefile b/Library/Homebrew/cask/Rakefile deleted file mode 100644 index b2b9fce526..0000000000 --- a/Library/Homebrew/cask/Rakefile +++ /dev/null @@ -1,17 +0,0 @@ -require "rake/testtask" -require "rspec/core/rake_task" - -$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew")) -$LOAD_PATH.unshift(File.expand_path("../lib", __FILE__)) - -namespace :test do - namespace :coverage do - desc "Upload coverage to Codecov" - task :upload do - require "simplecov" - require "codecov" - formatter = SimpleCov::Formatter::Codecov.new - formatter.format(SimpleCov::ResultMerger.merged_result) - end - end -end diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb index 43683a2634..94902e41c5 100755 --- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb +++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb @@ -52,6 +52,9 @@ repo_root.cd do if upload_coverage puts "Submitting Codecov coverage..." - system "bundle", "exec", "rake", "test:coverage:upload" + require "simplecov" + require "codecov" + formatter = SimpleCov::Formatter::Codecov.new + formatter.format(SimpleCov::ResultMerger.merged_result) end end