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.

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

Release/0.23.0 #1437

Merged
merged 9 commits into from
May 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 0.23.0

* Support for Cucumber 6

### 0.22.2
Fix irb/pry settings #1426

Expand Down
4 changes: 2 additions & 2 deletions calabash-cucumber/calabash-cucumber.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ Gem::Specification.new do |s|
s.add_dependency('awesome_print')

s.add_development_dependency 'yard', '~> 0.8'
s.add_development_dependency 'redcarpet', '3.2.0'
s.add_development_dependency 'redcarpet', '3.5.1'

# Shared with run-loop.
s.add_development_dependency("rspec_junit_formatter")
s.add_development_dependency 'luffa', '>= 1.1.0' # Remove ASAP.
# Rake 11.0 is not compatible with rspec 3.4.* or 3.5.0.beta1
s.add_development_dependency 'rake', "10.5.0"
s.add_development_dependency 'rake', "13.0.3"
s.add_development_dependency 'rspec'
s.add_development_dependency 'pry'
s.add_development_dependency 'pry-nav'
Expand Down
6 changes: 5 additions & 1 deletion calabash-cucumber/lib/calabash-cucumber/failure_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
path = screenshot(options)
filename = options[:label] || File.basename(path)
if self.respond_to?(:embed)
embed(path, 'image/png', filename)
begin
embed(path, 'image/png', filename)
rescue NoMethodError
attach(path, 'image/png')
end
else
RunLoop.log_info2("Embed is not available in this context. Will not embed.")
end
Expand Down
7 changes: 6 additions & 1 deletion calabash-cucumber/lib/calabash-cucumber/wait_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,12 @@ def screenshot_and_retry(msg, &block)
FileUtils.rm_f(path)
return res
else
embed(path, 'image/png', msg)
begin
embed(path, 'image/png', msg)
rescue NoMethodError
attach(path, 'image/png')
end

raise wait_error(msg)
end
end
Expand Down