Skip to content

Commit

Permalink
Merge pull request #163 from JuliaGizmos/jbj/testy-printy
Browse files Browse the repository at this point in the history
Gives a descriptive name to Interact signal printers, fixes a test with latest Reactive, fixes Travis issue on macos with julia 0.5
  • Loading branch information
JobJob authored May 16, 2017
2 parents dfb9c95 + be39279 commit 2e247ed
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ julia:
- nightly
notifications:
email: false
matrix:
allow_failures:
- julia: nightly
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.clone(pwd())'
- julia -e 'Pkg.test("Interact"; coverage=true)'
- julia -e 'cov=(VERSION < v"0.5-" || !is_apple() || VERSION >= v"0.6-"); Pkg.test("Interact"; coverage=cov)'
after_success:
- julia --color=yes -e 'cd(Pkg.dir("Interact")); Pkg.add("Coverage"); using Coverage;
Coveralls.submit(Coveralls.process_folder())'
2 changes: 1 addition & 1 deletion src/IJulia/setup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function init_comm(x::Signal)
get_data_dict(value, mimes)))
end
end
preserve(map(notify, x))
preserve(map(notify, x; name="$(x.name) printer (Interact)"))
else
comm = comms[x]
end
Expand Down
2 changes: 1 addition & 1 deletion test/ijulia.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sliderWidget = slider(1:5)
# Julia v0.6 uses spaces after commas when printing types, but
# previous versions did not. To ensure that this test works on all
# versions, we just remove spaces from both sides of the comparison.
@test removespaces("""Interact.Slider{Int64}(Signal{Int64}(3, nactions=1),\"\",3,1:5,\"horizontal\",true,\"d\",true)""") == removespaces(stringmime("text/plain", sliderWidget))
@test removespaces("""Interact.Slider{Int64}($(string(signal(sliderWidget))),\"\",3,1:5,\"horizontal\",true,\"d\",true)""") == removespaces(stringmime("text/plain", sliderWidget))
@test "3" == stringmime("text/plain", signal(sliderWidget))

@test "" == stringmime("text/html", sliderWidget)
Expand Down

0 comments on commit 2e247ed

Please sign in to comment.