m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Merge pull request #669 from MetaMask/Version-2.12.1

Browse Source 
Version 2.12.1
This commit is contained in:
Dan Finlay 2016-09-14 15:56:16 -07:00 committed by Dan Finlay
commit 0626adc0b4
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,15 +2,17 @@
## Current Master ## Current Master
## 2.12.1 2016-09-14
- Fixed bug where if you send a transaction from within MetaMask extension the - Fixed bug where if you send a transaction from within MetaMask extension the
popup notification opens up. 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 ## 2.12.0 2016-09-14
- Add a QR button to the Account detail screen - Add a QR button to the Account detail screen
- Fixed bug where opening MetaMask could close a non-metamask popup. - Fixed bug where opening MetaMask could close a non-metamask popup.
- Fixed memory leak that caused occasional crashes. - 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 ## 2.11.1 2016-09-12

2
app/manifest.json
View File

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

18
test/unit/extension-test.js
View File

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