github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15108 from atom/ns-fix-spec-helper

Browse Source 
Remove duplicate mocking
This commit is contained in:
Nathan Sobo
2017-07-31 13:35:27 -06:00
committed by GitHub
parent a38b438338 f33bca4fd9
commit 2cd1a08b65
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/spec-helper.coffee
View File

@@ -64,8 +64,8 @@ beforeEach ->
atom.project.setPaths([specProjectPath])
window.resetTimeouts()
spyOn(Date, 'now').andCallFake -> window.now
spyOn(_._, "now").andCallFake -> window.now
spyOn(Date, 'now').andCallFake(-> window.now)
spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout
@@ -188,8 +188,6 @@ jasmine.useRealClock = ->
jasmine.useMockClock = ->
spyOn(window, 'setInterval').andCallFake(fakeSetInterval)
spyOn(window, 'clearInterval').andCallFake(fakeClearInterval)
spyOn(Date, 'now').andCallFake(-> window.now)
addCustomMatchers = (spec) ->
spec.addMatchers