Merge pull request #669 from MetaMask/Version-2.12.1

Version 2.12.1

CHANGELOG.md

@@ -2,15 +2,17 @@
 
 ## Current Master
 
+## 2.12.1 2016-09-14
+
 - Fixed bug where if you send a transaction from within MetaMask extension the
 popup notification opens up.
+- Fixed bug where some tx errors would block subsequent txs until the plugin was refreshed.
 
 ## 2.12.0 2016-09-14
 
 - Add a QR button to the Account detail screen
 - Fixed bug where opening MetaMask could close a non-metamask popup.
 - Fixed memory leak that caused occasional crashes.
-- Fixed bug where some tx errors would block subsequent txs until the plugin was refreshed.
 
 ## 2.11.1 2016-09-12
 

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

test/unit/extension-test.js

@@ -1,8 +1,8 @@
 var assert = require('assert')
 var sinon = require('sinon')
 const ethUtil = require('ethereumjs-util')
-GLOBAL.chrome = {}
-GLOBAL.browser = {}
+global.chrome = {}
+global.browser = {}
 
 var path = require('path')
 var Extension = require(path.join(__dirname, '..', '..', 'app', 'scripts', 'lib', 'extension-instance.js'))
@@ -13,19 +13,21 @@ describe('extension', function() {
     const desiredResult = 'http://the-desired-result.io'
 
     describe('in Chrome or Firefox', function() {
-      GLOBAL.chrome.extension = {
+      global.chrome.extension = {
         getURL: () => desiredResult
       }
 
       it('returns the desired result', function() {
+        console.dir(Extension)
         const extension = new Extension()
+        console.dir(extension)
         const result = extension.extension.getURL()
         assert.equal(result, desiredResult)
       })
     })
 
     describe('in Microsoft Edge', function() {
-      GLOBAL.browser.extension = {
+      global.browser.extension = {
         getURL: () => desiredResult
       }
 
@@ -41,7 +43,7 @@ describe('extension', function() {
     let extension
 
     beforeEach(function() {
-      GLOBAL.chrome = {
+      global.chrome = {
         alarms: 'foo'
       }
       extension = new Extension()
@@ -58,9 +60,9 @@ describe('extension', function() {
 
     beforeEach(function() {
       realWindow = window
-      window = GLOBAL
-      GLOBAL.chrome = undefined
-      GLOBAL.alarms = 'foo'
+      window = global
+      global.chrome = undefined
+      global.alarms = 'foo'
       extension = new Extension()
     })