Merge branch 'master' of https://github.com/chinclubi/faker.js

1 files changed, 156 insertions, 90 deletions

diff --git a/test/image.unit.js b/test/image.unit.js
index 02e4c42b..5f5e7b48 100644
--- a/test/image.unit.js
+++ b/test/image.unit.js
@@ -5,113 +5,179 @@ if (typeof module !== 'undefined') {
 }
 
 describe("image.js", function () {
-    describe("imageUrl()", function () {
+    describe("lorempixel", function() {
+      describe("imageUrl()", function () {
         it("returns a random image url from lorempixel", function () {
-            var imageUrl = faker.image.imageUrl();
+            var imageUrl = faker.image.lorempixel.imageUrl();
 
             assert.equal(imageUrl, 'http://lorempixel.com/640/480');
         });
         it("returns a random image url from lorempixel with width and height", function () {
-            var imageUrl = faker.image.imageUrl(100, 100);
+            var imageUrl = faker.image.lorempixel.imageUrl(100, 100);
 
             assert.equal(imageUrl, 'http://lorempixel.com/100/100');
         });
         it("returns a random image url for a specified category", function () {
-            var imageUrl = faker.image.imageUrl(100, 100, 'abstract');
+            var imageUrl = faker.image.lorempixel.imageUrl(100, 100, 'abstract');
 
             assert.equal(imageUrl, 'http://lorempixel.com/100/100/abstract');
         });
-        /*
-        it.only("returns a random image url from lorempixel with a randomizer", function () {
-            var imageUrl = faker.image.imageUrl(100, 100, undefined, true);
-
-            console.log(imageUrl);
-            assert.ok(imageUrl.match(/^http:\/\/lorempixel.com\/100\/100\?[\d]+$/));
-        });
-        */
-    });
-    describe("avatar()", function () {
-        it("return a random avatar from UIFaces", function () {
-            assert.notEqual(-1, faker.image.avatar().indexOf('s3.amazonaws.com/uifaces/faces'));
-        })
-    });
-    describe("abstract()", function () {
-        it("returns a random abstract image url", function () {
-            var abstract = faker.image.abstract();
-            assert.equal(abstract, 'http://lorempixel.com/640/480/abstract');
-        });
-    });
-    describe("animals()", function () {
-        it("returns a random animals image url", function () {
-            var animals = faker.image.animals();
-            assert.equal(animals, 'http://lorempixel.com/640/480/animals');
-        });
-    });
-    describe("business()", function () {
-        it("returns a random business image url", function () {
-            var business = faker.image.business();
-            assert.equal(business, 'http://lorempixel.com/640/480/business');
-        });
-    });
-    describe("cats()", function () {
-        it("returns a random cats image url", function () {
-            var cats = faker.image.cats();
-            assert.equal(cats, 'http://lorempixel.com/640/480/cats');
-        });
-    });
-    describe("city()", function () {
-        it("returns a random city image url", function () {
-            var city = faker.image.city();
-            assert.equal(city, 'http://lorempixel.com/640/480/city');
-        });
-    });
-    describe("food()", function () {
-        it("returns a random food image url", function () {
-            var food = faker.image.food();
-            assert.equal(food, 'http://lorempixel.com/640/480/food');
-        });
+      });
+      describe("avatar()", function () {
+          it("return a random avatar from UIFaces", function () {
+              assert.notEqual(-1, faker.image.lorempixel.avatar().indexOf('s3.amazonaws.com/uifaces/faces'));
+          })
+      });
+      describe("abstract()", function () {
+          it("returns a random abstract image url", function () {
+              var abstract = faker.image.lorempixel.abstract();
+              assert.equal(abstract, 'http://lorempixel.com/640/480/abstract');
+          });
+      });
+      describe("animals()", function () {
+          it("returns a random animals image url", function () {
+              var animals = faker.image.lorempixel.animals();
+              assert.equal(animals, 'http://lorempixel.com/640/480/animals');
+          });
+      });
+      describe("business()", function () {
+          it("returns a random business image url", function () {
+              var business = faker.image.lorempixel.business();
+              assert.equal(business, 'http://lorempixel.com/640/480/business');
+          });
+      });
+      describe("cats()", function () {
+          it("returns a random cats image url", function () {
+              var cats = faker.image.lorempixel.cats();
+              assert.equal(cats, 'http://lorempixel.com/640/480/cats');
+          });
+      });
+      describe("city()", function () {
+          it("returns a random city image url", function () {
+              var city = faker.image.lorempixel.city();
+              assert.equal(city, 'http://lorempixel.com/640/480/city');
+          });
+      });
+      describe("food()", function () {
+          it("returns a random food image url", function () {
+              var food = faker.image.lorempixel.food();
+              assert.equal(food, 'http://lorempixel.com/640/480/food');
+          });
+      });
+      describe("nightlife()", function () {
+          it("returns a random nightlife image url", function () {
+              var nightlife = faker.image.lorempixel.nightlife();
+              assert.equal(nightlife, 'http://lorempixel.com/640/480/nightlife');
+          });
+      });
+      describe("fashion()", function () {
+          it("returns a random fashion image url", function () {
+              var fashion = faker.image.lorempixel.fashion();
+              assert.equal(fashion, 'http://lorempixel.com/640/480/fashion');
+          });
+      });
+      describe("people()", function () {
+          it("returns a random people image url", function () {
+              var people = faker.image.lorempixel.people();
+              assert.equal(people, 'http://lorempixel.com/640/480/people');
+          });
+      });
+      describe("nature()", function () {
+          it("returns a random nature image url", function () {
+              var nature = faker.image.lorempixel.nature();
+              assert.equal(nature, 'http://lorempixel.com/640/480/nature');
+          });
+      });
+      describe("sports()", function () {
+          it("returns a random sports image url", function () {
+              var sports = faker.image.lorempixel.sports();
+              assert.equal(sports, 'http://lorempixel.com/640/480/sports');
+          });
+      });
+      describe("technics()", function () {
+          it("returns a random technics image url", function () {
+              var technics = faker.image.lorempixel.technics();
+              assert.equal(technics, 'http://lorempixel.com/640/480/technics');
+          });
+      });
+      describe("transport()", function () {
+          it("returns a random transport image url", function () {
+              var transport = faker.image.lorempixel.transport();
+              assert.equal(transport, 'http://lorempixel.com/640/480/transport');
+          });
+      });
     });
-    describe("nightlife()", function () {
-        it("returns a random nightlife image url", function () {
-            var nightlife = faker.image.nightlife();
-            assert.equal(nightlife, 'http://lorempixel.com/640/480/nightlife');
-        });
-    });
-    describe("fashion()", function () {
-        it("returns a random fashion image url", function () {
-            var fashion = faker.image.fashion();
-            assert.equal(fashion, 'http://lorempixel.com/640/480/fashion');
-        });
-    });
-    describe("people()", function () {
-        it("returns a random people image url", function () {
-            var people = faker.image.people();
-            assert.equal(people, 'http://lorempixel.com/640/480/people');
-        });
-    });
-    describe("nature()", function () {
-        it("returns a random nature image url", function () {
-            var nature = faker.image.nature();
-            assert.equal(nature, 'http://lorempixel.com/640/480/nature');
+
+    describe("unsplash", function() {
+      describe("imageUrl()", function () {
+        it("returns a random image url from unsplash", function () {
+            var imageUrl = faker.image.unsplash.imageUrl();
+
+            assert.equal(imageUrl, 'https://source.unsplash.com/640x480');
         });
-    });
-    describe("sports()", function () {
-        it("returns a random sports image url", function () {
-            var sports = faker.image.sports();
-            assert.equal(sports, 'http://lorempixel.com/640/480/sports');
+        it("returns a random image url from unsplash with width and height", function () {
+            var imageUrl = faker.image.unsplash.imageUrl(100, 100);
+
+            assert.equal(imageUrl, 'https://source.unsplash.com/100x100');
         });
-    });
-    describe("technics()", function () {
-        it("returns a random technics image url", function () {
-            var technics = faker.image.technics();
-            assert.equal(technics, 'http://lorempixel.com/640/480/technics');
+        it("returns a random image url for a specified category", function () {
+            var imageUrl = faker.image.unsplash.imageUrl(100, 100, 'food');
+
+            assert.equal(imageUrl, 'https://source.unsplash.com/category/food/100x100');
         });
-    });
-    describe("transport()", function () {
-        it("returns a random transport image url", function () {
-            var transport = faker.image.transport();
-            assert.equal(transport, 'http://lorempixel.com/640/480/transport');
+        it("returns a random image url with correct keywords for a specified category", function () {
+            var imageUrl = faker.image.unsplash.imageUrl(100, 100, 'food', 'keyword1,keyword2');
+
+            assert.equal(imageUrl, 'https://source.unsplash.com/category/food/100x100?keyword1,keyword2');
         });
+        it("returns a random image url without keyword which format is wrong for a specified category", function () {
+            var imageUrl = faker.image.unsplash.imageUrl(100, 100, 'food', 'keyword1,?ds)0123$*908932409');
+
+            assert.equal(imageUrl, 'https://source.unsplash.com/category/food/100x100');
+        });
+      });
+      describe("image()", function() {
+          it("returns a searching image url with keyword", function () {
+              var food = faker.image.unsplash.image(100, 200, 'keyword1,keyword2,keyword3');
+              assert.equal(food, 'https://source.unsplash.com/100x200?keyword1,keyword2,keyword3');
+          });
+      })
+      describe("food()", function () {
+          it("returns a random food image url", function () {
+              var food = faker.image.unsplash.food();
+              assert.equal(food, 'https://source.unsplash.com/category/food/640x480');
+          });
+      });
+      describe("people()", function () {
+          it("returns a random people image url", function () {
+              var people = faker.image.unsplash.people();
+              assert.equal(people, 'https://source.unsplash.com/category/people/640x480');
+          });
+      });
+      describe("nature()", function () {
+          it("returns a random nature image url", function () {
+              var nature = faker.image.unsplash.nature();
+              assert.equal(nature, 'https://source.unsplash.com/category/nature/640x480');
+          });
+      });
+      describe("technology()", function () {
+          it("returns a random technology image url", function () {
+              var transport = faker.image.unsplash.technology();
+              assert.equal(transport, 'https://source.unsplash.com/category/technology/640x480');
+          });
+      });
+      describe("objects()", function () {
+          it("returns a random objects image url", function () {
+              var transport = faker.image.unsplash.objects();
+              assert.equal(transport, 'https://source.unsplash.com/category/objects/640x480');
+          });
+      });
+      describe("buildings()", function () {
+          it("returns a random buildings image url", function () {
+              var transport = faker.image.unsplash.buildings();
+              assert.equal(transport, 'https://source.unsplash.com/category/buildings/640x480');
+          });
+      });
     });
     describe("dataUri", function () {
         it("returns a blank data", function () {