@@ -55,24 +55,64 @@ describe('Slideshow', function () {
5555
5656 describe ( 'loading from url' , function ( ) {
5757 it ( 'should download source with \\n line separators from url' , function ( ) {
58- var xhr = slideshow . loadFromUrl ( 'url' ) ;
59- xhr . success ( 'a\n---\nb' ) ;
58+ var xhrs = slideshow . loadFromUrls ( [ 'url' ] ) ;
59+ xhrs [ 0 ] . success ( 'a\n---\nb' ) ;
6060 var slides = slideshow . getSlides ( ) ;
6161 slides . length . should . eql ( 2 ) ;
6262 slides [ 0 ] . content . should . eql ( [ 'a' ] ) ;
6363 slides [ 1 ] . content . should . eql ( [ 'b' ] ) ;
6464 } ) ;
6565
6666 it ( 'should download source with \\r\\n line separators from url' , function ( ) {
67- var xhr = slideshow . loadFromUrl ( 'url' ) ;
68- xhr . success ( 'a\r\n---\r\nb' ) ;
67+ var xhrs = slideshow . loadFromUrls ( [ 'url' ] ) ;
68+ xhrs [ 0 ] . success ( 'a\r\n---\r\nb' ) ;
6969 var slides = slideshow . getSlides ( ) ;
7070 slides . length . should . eql ( 2 ) ;
7171 slides [ 0 ] . content . should . eql ( [ 'a' ] ) ;
7272 slides [ 1 ] . content . should . eql ( [ 'b' ] ) ;
7373 } ) ;
7474 } ) ;
7575
76+ describe ( 'loading from urls' , function ( ) {
77+ it ( 'should download sources with \\n line separators from urls' , function ( ) {
78+ var xhrs = slideshow . loadFromUrls ( [ 'url' , 'url' , 'url' ] ) ;
79+ xhrs [ 0 ] . success ( 'a' ) ;
80+ xhrs [ 1 ] . success ( 'b\n---\nc' ) ;
81+ xhrs [ 2 ] . success ( 'd' ) ;
82+ var slides = slideshow . getSlides ( ) ;
83+ slides . length . should . eql ( 4 ) ;
84+ slides [ 0 ] . content . should . eql ( [ 'a' ] ) ;
85+ slides [ 1 ] . content . should . eql ( [ 'b' ] ) ;
86+ slides [ 2 ] . content . should . eql ( [ 'c' ] ) ;
87+ slides [ 3 ] . content . should . eql ( [ 'd' ] ) ;
88+ } ) ;
89+
90+ it ( 'should download sources with \\r\\n line separators from urls' , function ( ) {
91+ var xhrs = slideshow . loadFromUrls ( [ 'url' , 'url' , 'url' ] ) ;
92+ xhrs [ 0 ] . success ( 'a' ) ;
93+ xhrs [ 1 ] . success ( 'b\r\n---\r\nc' ) ;
94+ xhrs [ 2 ] . success ( 'd' ) ;
95+ var slides = slideshow . getSlides ( ) ;
96+ slides . length . should . eql ( 4 ) ;
97+ slides [ 0 ] . content . should . eql ( [ 'a' ] ) ;
98+ slides [ 1 ] . content . should . eql ( [ 'b' ] ) ;
99+ slides [ 2 ] . content . should . eql ( [ 'c' ] ) ;
100+ slides [ 3 ] . content . should . eql ( [ 'd' ] ) ;
101+ } ) ;
102+
103+ it ( 'should download sources with single slides from urls' , function ( ) {
104+ var xhrs = slideshow . loadFromUrls ( [ 'url' , 'url' , 'url' ] ) ;
105+ xhrs [ 0 ] . success ( 'a' ) ;
106+ xhrs [ 1 ] . success ( 'b' ) ;
107+ xhrs [ 2 ] . success ( 'c' ) ;
108+ var slides = slideshow . getSlides ( ) ;
109+ slides . length . should . eql ( 3 ) ;
110+ slides [ 0 ] . content . should . eql ( [ 'a' ] ) ;
111+ slides [ 1 ] . content . should . eql ( [ 'b' ] ) ;
112+ slides [ 2 ] . content . should . eql ( [ 'c' ] ) ;
113+ } ) ;
114+ } ) ;
115+
76116 describe ( 'continued slides' , function ( ) {
77117 it ( 'should be created when using only two dashes' , function ( ) {
78118 slideshow . loadFromString ( 'a\n--\nb' ) ;
0 commit comments