From d8ca4a360e4f0bec073ee4593c50aff8d5fc1c9d Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Thu, 1 Dec 2016 09:03:33 -0800
Subject: [PATCH] Fix tests

---
 app/common/__tests__/database.test.js     |  25 ++++++++++++----------
 app/{static => icons}/icon.icns           | Bin
 app/{static => icons}/icon.ico            | Bin
 app/{static => icons}/install-spinner.gif | Bin
 app/package.json                          |   2 +-
 app/ui/containers/App.js                  |   1 +
 package.json                              |   5 +----
 7 files changed, 17 insertions(+), 16 deletions(-)
 rename app/{static => icons}/icon.icns (100%)
 rename app/{static => icons}/icon.ico (100%)
 rename app/{static => icons}/install-spinner.gif (100%)

diff --git a/app/common/__tests__/database.test.js b/app/common/__tests__/database.test.js
index 8b06b9441f..ae2762b642 100644
--- a/app/common/__tests__/database.test.js
+++ b/app/common/__tests__/database.test.js
@@ -23,6 +23,7 @@ describe('onChange()', () => {
   it('handles change listeners', async () => {
     const doc = {
       type: models.request.type,
+      parentId: 'nothing',
       name: 'foo'
     };
 
@@ -32,16 +33,17 @@ describe('onChange()', () => {
     };
     db.onChange(callback);
 
-    await db.insert(doc);
-    await db.insert(doc, true);
+    const newDoc = await models.request.create(doc);
+    const updatedDoc = await models.request.update(newDoc, {name: 'bar'});
     expect(changesSeen.length).toBe(2);
+
     expect(changesSeen).toEqual([
-      [[db.CHANGE_INSERT, doc, false]],
-      [[db.CHANGE_INSERT, doc, true]]
+      [[db.CHANGE_INSERT, newDoc, false]],
+      [[db.CHANGE_UPDATE, updatedDoc, false]],
     ]);
 
     db.offChange(callback);
-    await db.insert(doc);
+    await models.request.create(doc);
     expect(changesSeen.length).toBe(2);
   });
 });
@@ -50,6 +52,7 @@ describe('bufferChanges()', () => {
   it('properly buffers changes', async () => {
     const doc = {
       type: models.request.type,
+      parentId: 'n/a',
       name: 'foo'
     };
 
@@ -60,8 +63,8 @@ describe('bufferChanges()', () => {
     db.onChange(callback);
 
     db.bufferChanges();
-    await db.insert(doc);
-    await db.insert(doc, true);
+    const newDoc = await models.request.create(doc);
+    const updatedDoc = await models.request.update(newDoc, true);
 
     // Assert no change seen before flush
     expect(changesSeen.length).toBe(0);
@@ -69,15 +72,15 @@ describe('bufferChanges()', () => {
     // Assert changes seen after flush
     db.flushChanges();
     expect(changesSeen).toEqual([[
-      [db.CHANGE_INSERT, doc, false],
-      [db.CHANGE_INSERT, doc, true]
+      [db.CHANGE_INSERT, newDoc, false],
+      [db.CHANGE_UPDATE, updatedDoc, false]
     ]]);
 
     // Assert no more changes seen after flush again
     db.flushChanges();
     expect(changesSeen).toEqual([[
-      [db.CHANGE_INSERT, doc, false],
-      [db.CHANGE_INSERT, doc, true]
+      [db.CHANGE_INSERT, newDoc, false],
+      [db.CHANGE_UPDATE, updatedDoc, false]
     ]]);
   });
 });
diff --git a/app/static/icon.icns b/app/icons/icon.icns
similarity index 100%
rename from app/static/icon.icns
rename to app/icons/icon.icns
diff --git a/app/static/icon.ico b/app/icons/icon.ico
similarity index 100%
rename from app/static/icon.ico
rename to app/icons/icon.ico
diff --git a/app/static/install-spinner.gif b/app/icons/install-spinner.gif
similarity index 100%
rename from app/static/install-spinner.gif
rename to app/icons/install-spinner.gif
diff --git a/app/package.json b/app/package.json
index 44e7f69b1f..1dfccc784d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia",
-  "version": "3.8.0",
+  "version": "4.0.0",
   "productName": "Insomnia",
   "longName": "Insomnia REST Client",
   "description": "A simple and beautiful REST API client",
diff --git a/app/ui/containers/App.js b/app/ui/containers/App.js
index a1baf14f1b..698ab0e84d 100644
--- a/app/ui/containers/App.js
+++ b/app/ui/containers/App.js
@@ -325,6 +325,7 @@ class App extends Component {
     if (firstLaunch) {
       // TODO: Show a welcome message
       trackLegacyEvent('First Launch');
+      trackEvent('General', 'First Launch', getAppVersion());
     } else if (lastVersion !== getAppVersion()) {
       trackEvent('General', 'Updated', getAppVersion());
       showModal(ChangelogModal);
diff --git a/package.json b/package.json
index 95cf569cb9..752fbe77b0 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "build:clean": "rm -rf ./build && rm -rf ./dist && mkdir ./build",
     "build:renderer": "cross-env NODE_ENV=production webpack --config ./webpack/webpack.config.production.babel.js",
     "build:main": "cross-env NODE_ENV=production webpack --config ./webpack/webpack.config.electron.babel.js",
-    "build:copy": "cp -r ./app/package.json ./app/static ./build/",
+    "build:copy": "cp -r ./app/package.json ./app/static ./app/icons/* ./build/",
     "build:install": "cd build && npm install",
     "build": "npm run build:clean && npm run build:renderer && npm run build:main && npm run build:copy && npm run build:install",
     "package:mac": "rm -rf dist/mac && node node_modules/electron-builder/out/build-cli.js --publish=never --x64 --mac",
@@ -74,12 +74,9 @@
     "category": "public.app-category.developer-tools",
     "compression": "normal",
     "mac": {
-      "icon": "build/static/icon.icns"
     },
     "win": {
       "iconUrl": "https://insomnia.rest/images/icon.png",
-      "icon": "build/static/icon.ico",
-      "loadingGif": "build/static/install-spinner.gif",
       "__remoteReleases": "https://s3.amazonaws.com/downloads.insomnia.rest/win",
       "target": "squirrel",
       "msi": false