Fix cucumber coverage #898
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,7 +55,7 @@ Feature: Usage of configuration | |
| Given a file named "spec/support/aruba_config.rb" with: | ||
| """ruby | ||
| Aruba.configure do |config| | ||
| config.exit_timeout = 0.7 | ||
|
Contributor
There was a problem hiding this comment. I'd rather avoid these changes to the timeouts. Aruba's tests suite takes a long time as it is. Also, I ran the full test suite without these timeout changes and there were no failures. Are you able to run the test suite without failures from the
Author
There was a problem hiding this comment. If I remember correctly, I increased the timeouts so that the tests would pass the
Author
There was a problem hiding this comment. It's also worth noting, that
Contributor
There was a problem hiding this comment. Hm .. maybe |
||
| end | ||
| """ | ||
| And a file named "spec/support/hooks.rb" with: | ||
|
|
@@ -96,7 +96,7 @@ Feature: Usage of configuration | |
| Given a file named "features/support/aruba_config.rb" with: | ||
| """ruby | ||
| Aruba.configure do |config| | ||
| config.exit_timeout = 0.7 | ||
| end | ||
| """ | ||
| And a file named "features/run.feature" with: | ||
|
|
@@ -107,7 +107,7 @@ Feature: Usage of configuration | |
| Then the exit status should be 0 | ||
|
|
||
| Scenario: Slow command | ||
| When I run `aruba-test-cli 1.5` | ||
| Then the exit status should be 128 | ||
| """ | ||
| When I run `cucumber` | ||
|
|
@@ -122,7 +122,7 @@ Feature: Usage of configuration | |
| Given a file named "features/support/aruba_config.rb" with: | ||
| """ruby | ||
| Aruba.configure do |config| | ||
| config.exit_timeout = 0.7 | ||
| end | ||
| """ | ||
| And a file named "features/support/hooks.rb" with: | ||
|
|
@@ -140,11 +140,11 @@ Feature: Usage of configuration | |
|
|
||
| @slow-command | ||
| Scenario: Slow command known by the developer | ||
| When I run `aruba-test-cli 1` | ||
| Then the exit status should be 0 | ||
|
|
||
| Scenario: Slow command which might be a failure | ||
| When I run `aruba-test-cli 1` | ||
| Then the exit status should be 128 | ||
| """ | ||
| When I run `cucumber` | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,32 @@ | ||
| $LOAD_PATH.unshift File.expand_path("../../lib", __dir__) | ||
|
|
||
| # Has to be the first file required so that all other files show coverage information | ||
| require_relative "simplecov/simplecov_setup" unless RUBY_PLATFORM.include?("java") | ||
|
|
||
| # Standard Library | ||
| require "fileutils" | ||
| require "pathname" | ||
| # Gems | ||
| require "aruba/cucumber" | ||
| require "aruba/config/jruby" | ||
| require "rspec/expectations" | ||
|
|
||
| Around do |test_case, block| | ||
| command_name = "#{test_case.location.file}:#{test_case.location.line} # #{test_case.name}" | ||
|
|
||
| # Used in simplecov_setup so that each scenario has a different name and | ||
| # their coverage results are merged instead of overwriting each other as | ||
| # 'Cucumber Features' | ||
| set_environment_variable "SIMPLECOV_COMMAND_NAME", command_name.to_s | ||
|
|
||
| simplecov_setup_pathname = | ||
| Pathname.new(__FILE__).expand_path.parent.join("simplecov").to_s | ||
|
|
||
| # set environment variable so child processes will merge their coverage data | ||
| # with parent process's coverage data. | ||
| prepend_environment_variable "RUBYOPT", "-I#{simplecov_setup_pathname} -rsimplecov_setup " | ||
|
|
||
| with_environment do | ||
| block.call | ||
| end | ||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # @note this file is loaded in env.rb to setup simplecov using RUBYOPTs for | ||
| # child processes and @in-process | ||
| unless RUBY_PLATFORM.include?("java") | ||
| require "simplecov" | ||
| root = File.expand_path("../../..", __dir__) | ||
| command_name = ENV["SIMPLECOV_COMMAND_NAME"] || "Cucumber Features" | ||
| SimpleCov.command_name(command_name) | ||
| SimpleCov.root(root) | ||
|
|
||
| # Run simplecov by default | ||
| SimpleCov.start unless ENV.key? "ARUBA_NO_COVERAGE" | ||
|
|
||
| module SimpleCov | ||
| module Formatter | ||
| # @note this is a monkey patch to suppress console output generated by | ||
| # the Simplecov HTML formatter. | ||
| # | ||
| # The Simplecov HTML formatter, which is the default, writes a message to | ||
| # the console after it has stored coverage information the `coverage` | ||
| # directory. There is no built in way to suppress this message. See | ||
| # simplecov-ruby/simplecov-html#116 and | ||
| # https://github.com/simplecov-ruby/simplecov-html/blob/v0.12.3/lib/simplecov-html.rb#L23..L32. | ||
| # | ||
| # The console output generated by the default formatter causes failures | ||
| # for Aruba tests that are expecting exact command output. | ||
| # | ||
| # The approach employed here is to monkey patch the method so that it | ||
| # still generates the same message, but instead of writing to the console, | ||
| # it writes to a file in the `coverage` directory named `summary.txt`. | ||
| class HTMLFormatter | ||
| def format(result) | ||
| Dir[File.join(File.dirname(__FILE__), "../public/*")].each do |path| | ||
| FileUtils.cp_r(path, asset_output_path) | ||
| end | ||
|
Contributor
There was a problem hiding this comment. This doesn't work because the original code refers to a One way to fix this would be to However another option would be to set
Author
There was a problem hiding this comment. Good catch! I'll give the |
||
|
|
||
| File.open(File.join(output_path, "index.html"), "wb") do |file| | ||
| file.puts template("layout").result(binding) | ||
| end | ||
|
|
||
| File.open(File.join(output_path, "summary.txt"), "w") do |file| | ||
| file.puts output_message(result) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't normally be needed. Can you remove this commit please?