raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up some of the Javascript tests

Browse Source
This commit is contained in:
Raoul Snyman 2019-01-15 23:15:21 -07:00
parent 2f8ad08d1a
commit 28a920b540
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -8,11 +8,11 @@
}, },
"dependencies": { "dependencies": {
"jasmine-core": "^2.6.4", "jasmine-core": "^2.6.4",
"karma": "^1.7.0", "karma": "^3.1.4",
"karma-coverage": "^1.1.1", "karma-coverage": "^1.1.2",
"karma-jasmine": "^1.1.0", "karma-jasmine": "^1.1.0",
"karma-phantomjs-launcher": "^1.0.4", "karma-phantomjs-launcher": "^1.0.4",
"phantomjs-prebuilt": "^2.1.14" "phantomjs-prebuilt": "^2.1.16"
}, },
"scripts": { "scripts": {
"test": "karma start" "test": "karma start"

16
tests/js/test_display.js
View File

@ -78,8 +78,8 @@ describe("The Display object", function () {
overview: false, overview: false,
center: false, center: false,
help: false, help: false,
transition: "slide", transition: "none",
backgroundTransition: "fade", backgroundTransition: "none",
viewDistance: 9999, viewDistance: 9999,
width: "100%", width: "100%",
height: "100%" height: "100%"
@ -274,10 +274,9 @@ describe("Display.setImageSlides", function () {
}); });
it("should add a list of images", function () { it("should add a list of images", function () {
var slides = [{"file": "file://openlp1.jpg"}, {"file": "file://openlp2.jpg"}]; var slides = [{"path": "file:///openlp1.jpg"}, {"path": "file:///openlp2.jpg"}];
spyOn(Display, "clearSlides"); spyOn(Display, "clearSlides");
spyOn(Display, "reinit"); spyOn(Display, "reinit");
spyOn(Reveal, "slide");
Display.setImageSlides(slides); Display.setImageSlides(slides);
@ -286,10 +285,9 @@ describe("Display.setImageSlides", function () {
expect(Display._slides["1"]).toEqual(1); expect(Display._slides["1"]).toEqual(1);
expect($(".slides > section").length).toEqual(2); expect($(".slides > section").length).toEqual(2);
expect($(".slides > section > img").length).toEqual(2); expect($(".slides > section > img").length).toEqual(2);
expect($(".slides > section > img")[0].getAttribute("src")).toEqual("file://openlp1.jpg") expect($(".slides > section > img")[0].getAttribute("src")).toEqual("file:///openlp1.jpg")
expect($(".slides > section > img")[1].getAttribute("src")).toEqual("file://openlp2.jpg") expect($(".slides > section > img")[1].getAttribute("src")).toEqual("file:///openlp2.jpg")
expect(Display.reinit).toHaveBeenCalledTimes(1); expect(Display.reinit).toHaveBeenCalledTimes(1);
expect(Reveal.slide).toHaveBeenCalledWith(0);
}); });
}); });
@ -306,7 +304,7 @@ describe("Display.setVideo", function () {
}); });
it("should add a video to the page", function () { it("should add a video to the page", function () {
var video = {"file": "file://video.mp4"}; var video = {"path": "file:///video.mp4"};
spyOn(Display, "clearSlides"); spyOn(Display, "clearSlides");
spyOn(Display, "reinit"); spyOn(Display, "reinit");
@ -315,7 +313,7 @@ describe("Display.setVideo", function () {
expect(Display.clearSlides).toHaveBeenCalledTimes(1); expect(Display.clearSlides).toHaveBeenCalledTimes(1);
expect($(".slides > section").length).toEqual(1); expect($(".slides > section").length).toEqual(1);
expect($(".slides > section > video").length).toEqual(1); expect($(".slides > section > video").length).toEqual(1);
expect($(".slides > section > video")[0].src).toEqual("file://video.mp4") expect($(".slides > section > video")[0].src).toEqual("file:///video.mp4")
expect(Display.reinit).toHaveBeenCalledTimes(1); expect(Display.reinit).toHaveBeenCalledTimes(1);
}); });
}); });