user mirage

igorrKurr · igorrKurr · commit 813259b1985a · 2015-12-20T16:04:55.000+02:00
diff --git a/.jshintrc b/.jshintrc
@@ -1,5 +1,6 @@
 {
   "predef": [
+    "server",
     "document",
     "window",
     "-Promise"
diff --git a/bower.json b/bower.json
@@ -5,22 +5,23 @@
     "jquery": "^1.11.1",
     "ember": "2.2.0",
     "ember-data": "2.2.0",
-    "ember-resolver": "~0.1.12",
-    "loader.js": "ember-cli/loader.js#3.2.1",
+    "ember-resolver": "~0.1.20",
+    "loader.js": "ember-cli/loader.js#3.3.0",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "0.2.2",
     "ember-load-initializers": "0.1.7",
     "ember-qunit": "0.4.7",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.20",
     "qunit": "~1.17.1",
-    "pretender": "0.1.0",
+    "pretender": "~0.10.1",
     "bootstrap-sass-official": "3.3.4",
     "typeahead.js": "0.10.5",
     "jquery-ui-sortable": "*",
     "bootstrap-datepicker": "~1.4.0",
     "jquery-ui-touch-punch": "furf/jquery-ui-touch-punch",
-    "jquery-ui-touch-punch-improved": "0.3.1"
+    "jquery-ui-touch-punch-improved": "0.3.1",
+    "lodash": "~3.7.0",
+    "Faker": "~3.0.0"
   },
   "resolutions": {
     "ember": "2.2.0"
diff --git a/package.json b/package.json
@@ -51,6 +51,7 @@
     "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-map": "0.4.2",
+    "ember-cli-mirage": "0.1.11",
     "ember-cli-pretender": "^0.5.0",
     "ember-cli-qunit": "^1.0.4",
     "ember-cli-release": "0.2.8",
diff --git a/server/.jshintrc b/server/.jshintrc
diff --git a/server/index.js b/server/index.js
diff --git a/server/mocks/app.js b/server/mocks/app.js
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -1,5 +1,6 @@
 {
   "predef": [
+    "server",
     "authenticateSession",
     "invalidateSession",
     "document",
diff --git a/tests/acceptance/auth-test.js b/tests/acceptance/auth-test.js
@@ -33,8 +33,10 @@ test('redirects to /login when I try to see content as not authenticated user',
 
 test('shows content when I`m authenticated', function(assert) {
   assert.expect(1);
+  server.createList('user', 1);
+  server.createList('avatar', 1);
 
-  authenticateSession(application, { id: 1 });
+  authenticateSession(application, {token: 'token123456', email: 'test@example.com', id: "1"});
   visit('/');
 
   andThen(function() {
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -3,34 +3,21 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Dummy Tests</title>
+    <title>Dummy</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     {{content-for 'head'}}
-    {{content-for 'test-head'}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
-    <link rel="stylesheet" href="assets/test-support.css">
   </head>
   <body>
     {{content-for 'body'}}
-    {{content-for 'test-body'}}
+
     <script src="assets/vendor.js"></script>
-    <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
-    <script src="testem.js"></script>
-    <script src="assets/test-loader.js"></script>
-    <script type="text/javascript" charset="utf-8">
-      Function.prototype.bind = Function.prototype.bind || function (thisp) {
-          var fn = this;
-          return function () {
-              return fn.apply(thisp, arguments);
-          };
-      };
-    </script>
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    <script src="http://api-maps.yandex.ru/2.0/?load=package.standard&lang=ru-Ru"></script>
+    <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&key=AIzaSyCqyf1CwoH9VU6XNYBmIXZSRsMQ0BJUOrw&libraries=places"></script>
   </body>
 </html>
diff --git a/tests/dummy/app/mirage/config.js b/tests/dummy/app/mirage/config.js
@@ -0,0 +1,63 @@
+export default function() {
+  this.namespace = 'api';
+
+  this.get('/users', function(db, req) {
+    let users = db.users;
+    let avatars = db.avatars;
+    if (req.queryParams.q) {
+      return {
+        users: [users[0]],
+        meta: {
+          total: 1
+        },
+        avatars: [avatars[0]]
+      };
+    }
+    var perPage = +req.queryParams.perPage;
+    var page = +req.queryParams.page;
+    let usersArray = users.slice((page - 1) * perPage, page * perPage);
+    if (req.queryParams.sort) {
+      let sort = req.queryParams.sort;
+      usersArray.sort(function(prev, next) {
+        if (prev[sort] < next[sort]) {
+          return -1;
+        } else if (prev[sort] === next[sort]) {
+          return 0;
+        } else {
+          return 1;
+        }
+      });
+      if (!JSON.parse(req.queryParams.orderAscending)) {
+        usersArray.reverse();
+      }
+    }
+    let avatarsArray = avatars.slice((page - 1) * perPage, page * perPage);
+    return {
+      users: usersArray,
+      meta: {
+        total: 50
+      },
+      avatars: avatarsArray
+    };
+  });
+
+  this.get('/users/autocomplete', 'users');
+
+  this.del('/users/:id', 'user');
+  this.get('/users/:id', function(db, req) {
+    let user = db.users.find(req.params.id);
+    let avatar = db.avatars.find(req.params.id);
+    return {user: user, avatars: [avatar]};
+  });
+  this.put('/users/:id', 'user');
+  this.post('/users', 'user');
+
+
+  this.put('/avatars/:id', 'avatar');
+  this.post('/avatars', 'avatar');
+
+  this.post('/users/sign_in', function() {
+    return {token: 'token123456', email: 'test@example.com', id: "1"};
+  });
+
+}
diff --git a/tests/dummy/app/mirage/factories/avatar.js b/tests/dummy/app/mirage/factories/avatar.js
@@ -0,0 +1,7 @@
+import Mirage, {faker} from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  url: faker.image.avatar,
+  position: faker.list.random(1,2,3),
+  thumb_url: faker.image.avatar,
+});
diff --git a/tests/dummy/app/mirage/factories/car.js b/tests/dummy/app/mirage/factories/car.js
@@ -0,0 +1,5 @@
+import Mirage, {faker} from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  title: faker.lorem.words(1),
+});
diff --git a/tests/dummy/app/mirage/factories/catalogue.js b/tests/dummy/app/mirage/factories/catalogue.js
@@ -0,0 +1,26 @@
+import Mirage from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  name: function(i) {
+    i = i + 1;
+    return "Tree #" + i;
+  },
+  parent_id: function(i) {
+    i = i + 1;
+    let pId = i - 1;
+    if (pId < 1) {
+      pId = null;
+    }
+    return pId;
+  },
+  catalogue_ids: function(i) {
+    i = i + 1;
+    if (i === 4 || i === 5) {
+      return [];
+    } else if (i === 1) {
+      return [2, 3];
+    } else {
+      return [i + 2];
+    }
+  }
+});
diff --git a/tests/dummy/app/mirage/factories/contact.js b/tests/dummy/app/mirage/factories/contact.js
@@ -0,0 +1,20 @@
+/*
+  This is an example factory definition.
+
+  Create more files in this directory to define additional factories.
+*/
+import Mirage/*, {faker} */ from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  // name: 'Pete',                         // strings
+  // age: 20,                              // numbers
+  // tall: true,                           // booleans
+
+  // email: function(i) {                  // and functions
+  //   return 'person' + i + '@test.com';
+  // },
+
+  // firstName: faker.name.firstName,       // using faker
+  // lastName: faker.name.firstName,
+  // zipCode: faker.address.zipCode
+});
diff --git a/tests/dummy/app/mirage/factories/user.js b/tests/dummy/app/mirage/factories/user.js
@@ -0,0 +1,13 @@
+import Mirage, { faker } from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  name: faker.name.findName(),
+  lat: faker.address.latitude(),
+  long: faker.address.longitude(),
+  email: faker.internet.email(),
+  zoom: 3,
+  birthdate: faker.date.past(),
+  avatar_id: function(i) {
+    return i + 1;
+  }
+});
diff --git a/tests/dummy/app/mirage/factories/user_category.js b/tests/dummy/app/mirage/factories/user_category.js
@@ -0,0 +1,14 @@
+import Mirage, { faker } from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  name: faker.company.bsNoun(),
+  zip_code: '123456',
+  email: faker.internet.email(),
+  is_created: true,
+  expired_at: faker.date.past(),
+  color: faker.internet.color(),
+  description: faker.lorem.sentences(10),
+  avatar_ids: function() {
+    return [1, 2];
+  },
+});
diff --git a/tests/dummy/app/mirage/scenarios/default.js b/tests/dummy/app/mirage/scenarios/default.js
@@ -0,0 +1,7 @@
+export default function(server) {
+  server.createList('user', 50);
+  server.createList('avatar', 50);
+  server.createList('car', 1);
+  server.createList('user_category', 2);
+  server.createList('catalogue', 5);
+}
diff --git a/tests/index.html b/tests/index.html
@@ -42,6 +42,14 @@
     <script src="assets/tests.js"></script>
     <script src="testem.js" integrity=""></script>
     <script src="assets/test-loader.js"></script>
+    <script type="text/javascript" charset="utf-8">
+      Function.prototype.bind = Function.prototype.bind || function (thisp) {
+          var fn = this;
+          return function () {
+              return fn.apply(thisp, arguments);
+          };
+      };
+    </script>
     <script src="http://api-maps.yandex.ru/2.0/?load=package.standard&lang=ru-Ru"></script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&key=AIzaSyCqyf1CwoH9VU6XNYBmIXZSRsMQ0BJUOrw&libraries=places"></script>
   </body>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"predef": [`
	`3`	`+ "server",`
`3`	`4`	`"document",`
`4`	`5`	`"window",`
`5`	`6`	`"-Promise"`