Skip to content
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.

Sign up for GitHub

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

Clean up cuke tags #548

Merged
merged 2 commits into from
Mar 6, 2018
Merged

Clean up cuke tags #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21fbb77
Don't double-ignore unsupported platforms
mvz Nov 8, 2017
d3c1246
Clean up and unify tags
mvz Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions cucumber.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ java_wip_opts = "--tags @wip-jruby-java-1.6:3" if defined?(JRUBY_VERSION) &&

ignore_opts = []
ignore_opts << '--tags ~@ignore'
ignore_opts << '--tags ~@unsupported-on-platform-java' if RUBY_PLATFORM.include? 'java'
ignore_opts << '--tags ~@unsupported-on-platform-mri' if !RUBY_PLATFORM.include? 'java'
ignore_opts << '--tags ~@unsupported-on-platform-windows' if FFI::Platform.windows?
ignore_opts << '--tags ~@unsupported-on-platform-unix' if FFI::Platform.unix?
ignore_opts << '--tags ~@unsupported-on-platform-mac' if FFI::Platform.mac?
ignore_opts << '--tags ~@unsupported-on-ruby-older-2' if RUBY_VERSION < '2'
ignore_opts = ignore_opts.join(' ')
%>
default: <%= std_opts %> --tags ~@wip <%= java_default_opts %> <%= ignore_opts %>
Expand Down
5 changes: 3 additions & 2 deletions features/03_testing_frameworks/cucumber/steps/command/stop_command.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ Feature: Stop commands
When I run `cucumber`
Then the features should all pass

@requires-ruby-platform-mri
Scenario: STDERR/STDOUT is written normally with MRI-Ruby if output was written in "signal"-handler
@unsupported-on-platform-java
Scenario: STDERR/STDOUT is written normally if output was written in "signal"-handler
Given an executable named "bin/aruba-test-cli1" with:
"""bash
#!/bin/bash
Expand Down Expand Up @@ -311,3 +311,4 @@ Feature: Stop commands
"""
When I run `cucumber`
Then the features should all pass

2 changes: 1 addition & 1 deletion features/step_definitions/hooks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
end
end

Before '@requires-ruby-platform-mri' do |scenario|
Before '@unsupported-on-platform-java' do |scenario|
# leave if not java
next unless RUBY_PLATFORM.include? 'java'

Expand Down