Skip to content

[pull] master from atom:master #18

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

Merged
pull merged 2 commits into from
May 24, 2021
Merged

[pull] master from atom:master #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0f6a10
fix spec toShow()
Connormiha May 18, 2016
ea4cbb7
Merge pull request #11786 from Connormiha/master
sadick254 May 24, 2021
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
3 changes: 2 additions & 1 deletion spec/spec-helper.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ addCustomMatchers = (spec) ->
element = @actual
element = element.get(0) if element.jquery
@message = -> return "Expected element '#{element}' or its descendants #{toOrNotTo} show."
element.style.display in ['block', 'inline-block', 'static', 'fixed']
computedStyle = getComputedStyle(element)
computedStyle.display isnt 'none' and computedStyle.visibility is 'visible' and not element.hidden

toEqualPath: (expected) ->
actualPath = path.normalize(@actual)
Expand Down