Merge branch 'master' of github.com:resumable2/resumable.js

AidasK · AidasK · commit 366f8ddc2b00 · 2013-09-27T17:11:06.000+03:00
diff --git a/README.md b/README.md
@@ -9,6 +9,21 @@ Resumable.js does not have any external dependencies other than the `HTML5 File
 
 Samples and examples are available in the `samples/` folder. Please push your own as Markdown to help document the project.
 
+## Can i see a demo?
+[Resumable.js + angular.js file upload demo](http://resumable2.github.io/ng-resumable/) - ng-resumable extension page https://github.com/resumable2/ng-resumable
+
+JQuery and node.js backend demo https://github.com/resumable2/resumable.js/tree/master/samples/Node.js
+
+## How can I install it?
+use bower:
+
+        bower install resumable.js#~2
+use cdn, look for available packages at http://www.jsdelivr.com/#!resumable.js
+        
+or use git clone
+
+        git clone https://github.com/resumable2/resumable.js
+
 ## How can I use it?
 
 A new `Resumable` object is created with information of what and where to post:
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "resumable.js",
-  "version": "2.0.0",
+  "version": "2.0.0-beta",
   "main": "src/resumable.js",
   "ignore": [
     "**/.*",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "resumable.js",
-  "version": "2.0.0",
+  "version": "2.0.0-beta",
   "description": "Resumable.js is a JavaScript library providing multiple simultaneous, stable and resumable uploads via the HTML5 File API",
   "main": "resumable.js",
   "scripts": {
diff --git a/test/setupSpec.js b/test/setupSpec.js
@@ -38,4 +38,67 @@ describe('setup', function() {
     expect(resumable.uploadNextChunk()).toBe(false);
   });
 
+  describe('assignBrowse', function() {
+    it('assign to input', function() {
+      var input = document.createElement('input');
+      var addFiles = jasmine.createSpy('addFiles');
+      resumable.addFiles = addFiles;
+      input.type = 'file';
+      resumable.assignBrowse(input);
+      expect(input.hasAttribute('multiple')).toBeTruthy();
+      expect(addFiles).not.toHaveBeenCalled();
+      var event = document.createEvent('MouseEvents');
+      event.initEvent('change', true, true);
+      input.dispatchEvent(event);
+      expect(addFiles).toHaveBeenCalled();
+    });
+
+    it('assign to div', function() {
+      var div = document.createElement('div');
+      var addFiles = jasmine.createSpy('addFiles');
+      resumable.addFiles = addFiles;
+      resumable.assignBrowse(div);
+      expect(div.children.length).toBe(1);
+      var input = div.children[0];
+      expect(addFiles).not.toHaveBeenCalled();
+      var event = document.createEvent('MouseEvents');
+      event.initEvent('change', true, true);
+      input.dispatchEvent(event);
+      expect(addFiles).toHaveBeenCalled();
+    });
+
+    it('single file', function() {
+      var input = document.createElement('input');
+      input.type = 'file';
+      resumable.assignBrowse(input, false, true);
+      expect(input.hasAttribute('multiple')).toBeFalsy();
+    });
+
+    it('directory', function() {
+      var input = document.createElement('input');
+      input.type = 'file';
+      resumable.assignBrowse(input, true);
+      expect(input.hasAttribute('webkitdirectory')).toBeTruthy();
+    });
+  });
+
+  describe('assignDrop', function() {
+    it('assign to div', function() {
+      var div = document.createElement('div');
+      var onDrop = jasmine.createSpy('onDrop');
+      resumable.onDrop = onDrop;
+      resumable.assignDrop(div);
+      var event = document.createEvent('MouseEvents');
+      event.initEvent('drop', true, true);
+      event.dataTransfer = {files: []};
+      div.dispatchEvent(event);
+      expect(onDrop).toHaveBeenCalled();
+      expect(onDrop.callCount).toBe(1);
+
+      resumable.unAssignDrop(div);
+      div.dispatchEvent(event);
+      expect(onDrop.callCount).toBe(1);
+    });
+  });
+
 });
diff --git a/test/uploadSpec.js b/test/uploadSpec.js
@@ -56,10 +56,11 @@ describe('upload file', function() {
     expect(requests[2].url).toContain('b=2');
     expect(requests[2].url).not.toContain('a=1');
 
+    resumable.opts.target = 'file?w=w';
     resumable.opts.query = undefined;
     resumable.files[0].retry();
     expect(requests.length).toBe(4);
-    expect(requests[3].url).toContain('file');
+    expect(requests[3].url).toContain('file?w=w&');
     expect(requests[3].url).not.toContain('a=1');
     expect(requests[3].url).not.toContain('b=2');
   });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "resumable.js",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.0.0-beta",`
`4`	`4`	`"main": "src/resumable.js",`
`5`	`5`	`"ignore": [`
`6`	`6`	`"*/.",`