Merged Tag v0.3.0 (from xcpretty/xcpretty) and branch fix/duration_of_failed_tests_workaroundinto into repository #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

ObjectAlchemist wants to merge 73 commits into Backelite:master from ObjectAlchemist:master

.gitignore

-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     *.gem
     *.rbc
     .bundle
+    .vendor
     .config
     .yardoc
     .rspec
@@ Expand Down @@

.travis.yml

-Original file line number
+Diff line change
@@ -1,11 +1,12 @@
     language: ruby
     sudo: false
-    install:
-      - bundle install
     rvm:
       - 2.1.1
       - 2.0.0
-    script: rake ci
+    script:
+      - rake spec
+      - rake cucumber
+      - rake lint

CHANGELOG.md

-Original file line number
+Diff line change
@@ -1,5 +1,30 @@
     # Changelog
+    ## 0.3.0
+    ###### Enhancements
+    * Add catch-all formatter to allow formatting unrecognized text
+      | [Chris Ballinger](https://github.com/chrisballinger)
+      | [#327](https://github.com/supermarin/xcpretty/pull/327)
+    * Support `ccache-clang` (and other commands) in formatted output and JSON
+      compilation database reports
+      | [Delisa Mason](https://github.com/kattrali)
+      | [#332](https://github.com/supermarin/xcpretty/pull/332)
+    ## 0.2.6
+    * Codesigning matchers improvements
+    * Screenshots parsing fixes
+    ###### Bug fixes
+    * Fix reporers crash by default ld warning implementation
+      | [iKiKi](https://github.com/iKiKi)
+      | [#187](https://github.com/supermarin/xcpretty/pull/187)
     ## 0.2.1
     ###### Bug fixes
@@ Expand Down @@

LICENSE.txt

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    Copyright (c) 2013 Marin Usalj
+    Copyright (c) 2013-2016 Marin Usalj
     MIT License
@@ Expand Down @@

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,6 +6,7 @@ It does one thing, and it should do it well.
  
    [![Gem version](http://img.shields.io/gem/v/xcpretty.svg)](http://rubygems.org/gems/xcpretty)

    [![Build Status](https://travis-ci.org/supermarin/xcpretty.svg?branch=master)](https://travis-ci.org/supermarin/xcpretty)

    [![Code Climate](http://img.shields.io/codeclimate/github/supermarin/xcpretty.svg)](https://codeclimate.com/github/supermarin/xcpretty)

    [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)

    ## Installation

    ``` bash

    @@ -67,7 +68,7 @@ $ xcodebuild [flags] | tee xcodebuild.log | xcpretty
  
    - `--report html`, `-r html`: Creates a simple HTML report at `build/reports/tests.html`.

    ![xcpretty html](http://i.imgur.com/0Rnux3v.gif)

    - `--report json-compilation-database`, `-r json-compilation-database`: Creates a [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) at `build/reports/compilation.json`. This is a format to replay single compilations independently of the build system.

    - `--report json-compilation-database`, `-r json-compilation-database`: Creates a [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) at `build/reports/compilation_db.json`. This is a format to replay single compilations independently of the build system.

    Writing a report to a custom path can be specified using `--output PATH`.

    @@ -76,7 +77,7 @@ Writing a report to a custom path can be specified using `--output PATH`.
  
    `xcpretty` supports custom formatters through the use of the

    `--formatter` flag, which takes a path to a file as an argument. The

    file must contain a Ruby subclass of `XCPretty::Formatter`, and

    return that class at the end of te file. The class

    return that class at the end of the file. The class

    can override the `format_*` methods to hook into output parsing

    events.

Rakefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,25 +1,18 @@
  
    require "bundler/gem_tasks"

    require 'rubocop/rake_task'

    require 'rspec/core/rake_task'

    require 'cucumber/rake/task'

    require 'bundler/gem_tasks'

    task :kick do

      sh 'bundle exec kicker -r ruby'

    end

    Cucumber::Rake::Task.new(:cucumber) do |task|

    task :spec do

      sh 'bundle exec rspec --color --format=doc'

    end

    RSpec::Core::RakeTask.new(:spec) do |task|

      task.rspec_opts = %w(--color --format=doc)

    task :cucumber do

      sh 'bundle exec cucumber'

    end

    RuboCop::RakeTask.new(:lint) do |task|

      task.fail_on_error = false

    task :lint do

      sh 'bundle exec rubocop'

    end

    task :ci do

      Rake::Task[:spec].invoke

      Rake::Task[:cucumber].invoke

      Rake::Task[:lint].invoke

    end

assets/report.html.erb

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,8 @@ @@
           .test.passing { background-color: #CAF59F;}
           .test.failing.odd { background-color: #EEC7CC;}
           .test.passing.odd { background-color: #E5FBCF;}
-          .details { background-color: #F4DDE0; border: 1px solid #C84F5E;}
+          .details.failing { background-color: #F4DDE0; border: 1px solid #C84F5E;}
+          .details.passing { background-color: #E5F4DC; border: 1px solid #A1D761;}
           .test .test-detail:last-child { padding-bottom: 8px;}
           .test .title { float: left; font-size: 0.9em; margin-top: 8px; font-family: Menlo, Monaco, monospace;}
           .test .time { float: left;margin: 4px 10px 0 20px;}
@@ Expand Down Expand Up / @@ -127,15 +128,6 @@ @@
                 <h3 class="title"><%= name %></h3>
               </section>
               <section class="tests">
-                <% unless info[:screenshots].empty? %>
-                <div class="screenshots <%= info[:failing] ? 'failing' : 'passing'%>">
-                  <% info[:screenshots].each_with_index do |screenshot, index| %>
-                      <a href="javascript:toggleScreenshot('<%=name %>', <%=index %>)">
-                        <img class="screenshot" id="screenshot-<%=name %>-<%=index %>" src="<%=screenshot %>" />
-                      </a>
-                  <% end %>
-                </div>
-                <% end %>
                 <table>
                 <% info[:tests].each_with_index do |test, index| %>
                   <% detail_class = test[:name].gsub(/\s/,'') %>
@@ Expand All / @@ -147,8 +139,8 @@ @@
                     </td>
                     <td><h3 class="title"><%= test[:name] %></h3></td>
                   </tr>
-                  <% if test[:reason] || test[:snippet] %>
-                    <tr class="details <%= detail_class %>">
+                  <% if test[:reason] || test[:snippet] || !test[:screenshots].empty? %>
+                    <tr class="details <%= test[:failing] ? 'failing' : 'passing'%> <%= detail_class %>">
                       <td></td>
                       <td>
                         <% if test[:reason] %>
@@ Expand All / @@ -158,6 +150,15 @@ @@
                           <section class="test-detail snippet"><%= test[:snippet] %></section>
                           <section class="test-detail"><%= test[:file] %></section>
                         <% end %>
+                        <% if !test[:screenshots].empty? %>
+                          <section class="test-detail">
+                            <% test[:screenshots].each_with_index do |screenshot, idx| %>
+                              <a href="javascript:toggleScreenshot('<%=test[:name] %>', <%=index %>)">
+                                <img class="screenshot" id="screenshot-<%=test[:name] %>-<%=index %>" src="<%=screenshot %>" />
+                              </a>
+                            <% end %>
+                          </section>
+                        <% end %>
                       </td>
                     </tr>
                   <% end %>
@@ Expand Down @@

bin/xcpretty

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -39,17 +39,21 @@ OptionParser.new do |opts|
  
        printer_opts[:formatter] = XCPretty::TestAnything

      end

      opts.on('-f', '--formatter PATH', 'Use formatter returned from evaluating the specified Ruby file') do |path|

        printer_opts[:formatter] = XCPretty.load_custom_formatter(path)

        printer_opts[:formatter] = XCPretty.load_custom_class(path)

      end

      opts.on('--[no-]color', 'Use colorized output. Defaults is auto') do |value|

      opts.on('-c', '--[no-]color', 'Use colorized output. Default is auto') do |value|

        printer_opts[:colorize] = value

      end

      opts.on('--[no-]utf', 'Use unicode characters in output. Default is auto.') do |value|

        printer_opts[:unicode] = value

      end

      opts.on("-r", "--report FORMAT", "Run FORMAT reporter",

      opts.on("-r", "--report FORMAT or PATH", "Run FORMAT or PATH reporter",

              "  Choices: #{report_formats.keys.join(', ')}") do |format|

        report_classes << report_formats[format]

        if report_formats.key?(format)

          report_classes << report_formats[format]

        else

          report_classes << XCPretty.load_custom_class(format)

        end

        report_options << {}

      end

      opts.on('-o', '--output PATH', 'Write report output to PATH') do |path|

    @@ -81,5 +85,6 @@ STDIN.each_line do |line|
  
      reporters.each { |r| r.handle(line) }

    end

    printer.finish

    reporters.each(&:finish)

0 ...CCommandSpec, line 80, hello xcpretty.png → ...hould_send_YES_while_executing_is_YES.png

File renamed without changes

features/custom_reporter.feature

-Original file line number
+Diff line change
@@ -0,0 +1,29 @@
+    Feature: Loading an arbitrary Ruby file as a reporter
+        Background:
+            Given the tests have started running
+        Scenario: The file loaded does not contain a Ruby class
+            When I pipe to xcpretty with "-r /bin/bash"
+            Then the exit status code should be 1
+        Scenario: The file loaded contains a Ruby class
+            Given I have a file to compile
+            When I pipe to xcpretty with a custom reporter
+            Then the exit status code should be 0
+        Scenario: Showing failed tests
+            Given I have a failing test in my suite
+            When I pipe to xcpretty with a custom reporter
+            Then I should see a failed test in my custom report
+            And the custom failure counter should show 1 test
+        Scenario: Showing passing tests
+            Given I have a passing test in my suite
+            When I pipe to xcpretty with a custom reporter
+            Then I should see a passing test in my custom report
+        Scenario: Showing pending tests
+            Given I have a pending test in my suite
+            When I pipe to xcpretty with a custom reporter
+            Then I should see a pending test in my custom report

features/json_compilation_database_report.feature

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,13 @@ Feature: Create a JSON compilation database @@
             Then the JSON compilation database should contain an entry with a directory
             Then the JSON compilation database should contain an entry with a file
+        Scenario: Showing file compilation with CCache
+            Given I have a file to compile with ccache
+            When I pipe to xcpretty with "--report json-compilation-database" and specify a custom path
+            Then the JSON compilation database should contain an entry with a command
+            Then the JSON compilation database should contain an entry with a directory
+            Then the JSON compilation database should contain an entry with a file
         Scenario: Handling a complete xcodebuild session
         	Given some big input
         	When I pipe to xcpretty with "--report json-compilation-database" and specify a custom path
@@ Expand Down @@

features/junit_report.feature

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,3 +42,8 @@ Feature: Creating a JUnit test report @@
         Scenario: Writing to multiple custom file paths
             When I pipe to xcpretty with two custom "junit" report paths
             Then I should have test reports in two custom paths
+        Scenario: Showing tests with one having a swift fatal error
+            Given I have a swift fatal error in a test in my suite
+            When I pipe to xcpretty with "--report junit"
+            Then I should see a failed test node in my report

features/simple_format.feature

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,11 @@ Feature: Showing build output in simple format @@
             When I pipe to xcpretty with "--simple --no-color"
             Then I should see a successful compilation message
+        Scenario: Showing file compilation with CCache
+            Given I have a file to compile with ccache
+            When I pipe to xcpretty with "--simple --no-color"
+            Then I should see a successful compilation message
         Scenario: Showing xib compilation
             Given I have a xib to compile
             When I pipe to xcpretty with "--simple --no-color"
@@ Expand Down Expand Up / @@ -45,6 +50,11 @@ Feature: Showing build output in simple format @@
             When I pipe to xcpretty with "--simple --color"
             Then I should see a yellow completion icon
+        Scenario: Showing aggregate target
+            Given I have an aggregate target to build
+            When I pipe to xcpretty with "--simple --no-color"
+            Then I should see an aggregate target message
         Scenario: Showing analyze
             Given I have a file to analyze
             When I pipe to xcpretty with "--simple --no-color"
@@ Expand Down Expand Up / @@ -162,6 +172,11 @@ Feature: Showing build output in simple format @@
             When I pipe to xcpretty with "--simple --no-color"
             Then I should see a successful code signing message
+        Scenario: Showing target will not be code signed warning
+            Given I have a target which will not be code signed
+            When I pipe to xcpretty with "--simple --color"
+            Then I should see a target will not be code signed warning
         Scenario: Showing preprocess
             Given I have a file to preprocess
             When I pipe to xcpretty with "--simple --no-color"
@@ Expand Down Expand Up / @@ -202,3 +217,22 @@ Feature: Showing build output in simple format @@
             When I pipe to xcpretty with "--simple --color"
             Then I should see a yellow warning message
+        Scenario: Showing provisioning profile doesn't support capability
+            Given the provisioning profile doesn't support capability
+            When I pipe to xcpretty with "--simple --no-color"
+            Then I should see the profile doesn't support capability message
+        Scenario: Showing provisioning profile doesn't include entitlement
+            Given the provisioning profile doesn't include entitlement
+            When I pipe to xcpretty with "--simple --no-color"
+            Then I should see the profile doesn't include entitlement message
+        Scenario: Showing code signing is required error
+            Given the target requires code signing
+            When I pipe to xcpretty with "--simple --no-color"
+            Then I should see the code signing is requried message
+        Scenario: Showing no profile matching error
+            Given the matching profile is missing
+            When I pipe to xcpretty with "--simple --no-color"
+            Then I should see the no profile matching message

features/steps/custom_reporter_steps.rb

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    Then(/^I should see a passing test in my custom report$/) do
+      custom_report.should include("WOW such PASS.")
+    end
+    Then(/^I should see a failed test in my custom report$/) do
+      custom_report.should include("WOW such FAIL.")
+    end
+    Then(/^I should see a pending test in my custom report$/) do
+      custom_report.should include("WOW such PENDING.")
+    end
+    Then(/^the custom failure counter should show (\d+) tests?$/) do |fail_count|
+      custom_report.should include("Much 1 FAIL.")
+    end

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merged Tag v0.3.0 (from xcpretty/xcpretty) and branch fix/duration_of_failed_tests_workaroundinto into repository #1

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Merged Tag v0.3.0 (from xcpretty/xcpretty) and branch fix/duration_of_failed_tests_workaroundinto into repository #1

Are you sure you want to change the base?

Uh oh!

Merged Tag v0.3.0 (from xcpretty/xcpretty) and branch fix/duration_of_failed_tests_workaroundinto into repository #1

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!