Updated tests to work with Xcode 9.2

SlatherOrg · Feb 11, 2018 · 5788fbf · 5788fbf
1 parent f986a46
commit 5788fbf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: objective-c
 script: bundle exec rake
-osx_image: xcode8.3
+osx_image: xcode9.2
 
 before_install:
   - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem

diff --git a/spec/slather/project_spec.rb b/spec/slather/project_spec.rb
@@ -509,9 +509,9 @@ class SpecXcode7CoverageFile < Slather::ProfdataCoverageFile
     it "should print out environment info when in verbose_mode" do
       project_root = Pathname("./").realpath
 
-      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+      [/\nProcessing coverage file: #{project_root}\/spec\/DerivedData\/libfixtures\/Build\/ProfileData\/[A-Z0-9-]+\/Coverage.profdata/,
        "Against binary files:",
-       "\t#{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests",
+       "\t#{project_root}/spec/DerivedData/libfixtures/Build/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests",
        "\n"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
@@ -525,7 +525,7 @@ class SpecXcode7CoverageFile < Slather::ProfdataCoverageFile
 
       project_root = Pathname("./").realpath
 
-      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+      [/\nProcessing coverage file: #{project_root}\/spec\/DerivedData\/libfixtures\/Build\/ProfileData\/[A-Z0-9-]+\/Coverage.profdata/,
        "No binary files found.",
        "\n",
       ].each do |line|
@@ -587,7 +587,7 @@ def decimal_f *args
     let(:configuration) { 'Debug' }
     let(:project_root) { Pathname("./").realpath }
     let(:coverage_dir) { "#{project_root}/spec/DerivedData/DerivedData/Build/Intermediates/CodeCoverage" }
-    let(:search_dir) { "#{coverage_dir}/Products/#{configuration}*/fixtures*" }
+    let(:search_dir) { "#{coverage_dir}/../../Products/#{configuration}*/fixtures*" }
     let(:binary_file) { "#{coverage_dir}/Products/#{configuration}-iphonesimulator/fixtures.app/fixtures" }
 
     before do