Skip to content

Commit

Permalink
Stop using aruba’s removed regexp.
Browse files Browse the repository at this point in the history
See cucumber/aruba#227 for background.
  • Loading branch information
myronmarston committed Jan 16, 2015
1 parent 0d82e69 commit 776ead9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions features/step_definitions/additional_cli_steps.rb
Expand Up @@ -8,13 +8,13 @@

Then /^the output should not contain any of these:$/ do |table|
table.raw.flatten.each do |string|
expect(all_output).not_to match(regexp(string))
expect(all_output).not_to include(string)
end
end

Then /^the output should contain one of the following:$/ do |table|
matching_output = table.raw.flatten.select do |string|
all_output =~ regexp(string)
all_output.include?(string)
end

expect(matching_output.count).to eq(1)
Expand Down Expand Up @@ -66,7 +66,7 @@
line =~ /(^\s+# [^:]+:\d+)/ ? $1 : line # http://rubular.com/r/zDD7DdWyzF
end.join("\n")

expect(normalized_output).to match(regexp(partial_output))
expect(normalized_output).to include(partial_output)
end

Then /^the output should not contain any error backtraces$/ do
Expand Down
2 changes: 1 addition & 1 deletion rspec-core.gemspec
Expand Up @@ -46,7 +46,7 @@ Gem::Specification.new do |s|
# Aruba 0.6.2 removed an API we rely on. For now we are excluding
# that version until we find out if they will restore it. See:
# https://github.com/cucumber/aruba/commit/5b2c7b445bc80083e577b793e4411887ef295660#commitcomment-9284628
s.add_development_dependency "aruba", "~> 0.5", "!= 0.6.2"
s.add_development_dependency "aruba", "~> 0.6"

s.add_development_dependency "nokogiri", (RUBY_VERSION < '1.9.3' ? "1.5.2" : "~> 1.5")
s.add_development_dependency "coderay", "~> 1.0.9"
Expand Down

0 comments on commit 776ead9

Please sign in to comment.