Rewrite tests with async/await

test/shared/versions/index.test.js

@@ -7,32 +7,21 @@ describe("shared/versions/storage", () => {
       return browser.storage.local.remove('version');
     });
 
-    it('return true if no previous versions', () => {
+    it('return true if no previous versions', async() => {
-      return Promise.resolve().then(() => {
+      let updated = await versions.checkUpdated();
-        return versions.checkUpdated();
+      expect(updated).to.be.true;
-      }).then((updated) => {
-        expect(updated).to.be.true;
-      });
     });
 
-    it('return true if updated', () => {
+    it('return true if updated', async() => {
-      return Promise.resolve().then(() => {
+      await browser.storage.local.set({ version: '0.001' });
-        return browser.storage.local.set({ version: '0.001' });
+      let updated = await versions.checkUpdated();
-      }).then(() => {
+      expect(updated).to.be.true;
-        return versions.checkUpdated();
-      }).then((updated) => {
-        expect(updated).to.be.true;
-      });
     });
 
-    it('return false if not updated', () => {
+    it('return false if not updated', async() => {
-      return Promise.resolve().then(() => {
+      await browser.storage.local.set({ version: manifest.version });
-        return browser.storage.local.set({ version: manifest.version });
+      let updated = await versions.checkUpdated();
-      }).then(() => {
+      expect(updated).to.be.false;
-        return versions.checkUpdated();
-      }).then((updated) => {
-        expect(updated).to.be.false;
-      });
     });
   });
 
@@ -41,15 +30,11 @@ describe("shared/versions/storage", () => {
       return browser.storage.local.remove('version');
     });
 
-    it('saves current version from manifest.json', () => {
+    it('saves current version from manifest.json', async() => {
-      return Promise.resolve().then(() => {
+      await versions.commit();
-        return versions.commit();
+      let { version } = await browser.storage.local.get('version');
-      }).then(() => {
+      expect(version).to.be.a('string');
-        return browser.storage.local.get('version');
+      expect(version).to.equal(manifest.version);
-      }).then(({version}) => {
-        expect(version).to.be.a('string');
-        expect(version).to.equal(manifest.version);
-      });
     });
   });
 });

test/shared/versions/storage.test.js

@@ -6,34 +6,23 @@ describe("shared/versions/storage", () => {
       return browser.storage.local.remove('version');
     });
 
-    it('loads saved version', () => {
+    it('loads saved version', async() => {
-      return Promise.resolve().then(() => {
+      await browser.storage.local.set({ version: '1.2.3' });
-        return browser.storage.local.set({ version: '1.2.3' });
+      let version = await storage.load();
-      }).then(() => {
+      expect(version).to.equal('1.2.3');
-        return storage.load();
-      }).then((version) => {
-        expect(version).to.equal('1.2.3');
-      });
     });
 
-    it('returns undefined if no versions in storage', () => {
+    it('returns undefined if no versions in storage', async() => {
-      return Promise.resolve().then(() => {
+      let version = await storage.load();
-        return storage.load();
+      expect(version).to.be.a('undefined');
-      }).then((version) => {
-        expect(version).to.be.a('undefined');
-      });
     });
   });
 
   describe('#save', () => {
-    it('saves version string', () => {
+    it('saves version string', async() => {
-      return Promise.resolve().then(() => {
+      await storage.save('2.3.4');
-        return storage.save('2.3.4');
+      let { version } = await browser.storage.local.get('version');
-      }).then(() => {
+      expect(version).to.equal('2.3.4');
-        return browser.storage.local.get('version');
-      }).then(({version}) => {
-        expect(version).to.equal('2.3.4');
-      });
     });
   });
 });