Merge pull request #3740 from reitermarkus/cask-style
Fix `brew cask style` on Travis.
This commit is contained in:
		
						commit
						9f4b4a1699
					
				@ -10,9 +10,9 @@ module Hbc
 | 
			
		||||
      def run
 | 
			
		||||
        install_rubocop
 | 
			
		||||
        cache_env = { "XDG_CACHE_HOME" => "#{HOMEBREW_CACHE}/style" }
 | 
			
		||||
        system(cache_env, "rubocop", *rubocop_args, "--", *cask_paths)
 | 
			
		||||
        hide_warnings = debug? ? [] : [ENV["HOMEBREW_RUBY_PATH"], "-W0", "-S"]
 | 
			
		||||
        system(cache_env, *hide_warnings, "rubocop", *rubocop_args, "--", *cask_paths)
 | 
			
		||||
        raise CaskError, "style check failed" unless $CHILD_STATUS.success?
 | 
			
		||||
        true
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      def install_rubocop
 | 
			
		||||
@ -43,8 +43,8 @@ module Hbc
 | 
			
		||||
        [
 | 
			
		||||
          "--require", "rubocop-cask",
 | 
			
		||||
          "--force-default-config",
 | 
			
		||||
          "--force-exclusion",
 | 
			
		||||
          "--format", "simple"
 | 
			
		||||
          "--format", "simple",
 | 
			
		||||
          "--parallel"
 | 
			
		||||
        ]
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -22,7 +22,10 @@ describe Hbc::CLI::Style, :cask do
 | 
			
		||||
 | 
			
		||||
    context "when rubocop succeeds" do
 | 
			
		||||
      let(:success) { true }
 | 
			
		||||
      it { is_expected.to be_truthy }
 | 
			
		||||
 | 
			
		||||
      it "does not raise an error" do
 | 
			
		||||
        expect { subject }.not_to raise_error
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context "when rubocop fails" do
 | 
			
		||||
@ -132,7 +135,7 @@ describe Hbc::CLI::Style, :cask do
 | 
			
		||||
  describe "#default_args" do
 | 
			
		||||
    subject { cli.default_args }
 | 
			
		||||
 | 
			
		||||
    it { is_expected.to include("--require", "rubocop-cask", "--format", "simple", "--force-exclusion") }
 | 
			
		||||
    it { is_expected.to include("--require", "rubocop-cask", "--format", "simple") }
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe "#autocorrect_args" do
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user