-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Converted the rest of the tests to es6 (#1203)
* Converted the rest of the tests to es6 * Switched back to "dot" reporter for mocha. Removed stray console.error line that should not have been committed. Removed dead/commented console.log lines elsewhere in the code.
- Loading branch information
Showing
127 changed files
with
6,015 additions
and
5,816 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,25 @@ | ||
var chai = require('chai'); | ||
var assert = chai.assert; | ||
import { assert } from 'chai'; | ||
|
||
global.ethereumProvider = {bzz: 'http://givenProvider:8500'}; | ||
|
||
|
||
describe('Web3.providers.givenProvider', function () { | ||
describe('should be set if ethereumProvider is available ', function () { | ||
|
||
it('when instantiating Web3', function () { | ||
|
||
var Web3 = require('../packages/web3'); | ||
global.ethereumProvider = { bzz: 'http://givenProvider:8500' }; | ||
|
||
describe('Web3.providers.givenProvider', () => { | ||
describe('should be set if ethereumProvider is available ', () => { | ||
it('when instantiating Web3', () => { | ||
// eslint-disable-next-line global-require | ||
const Web3 = require('../packages/web3'); | ||
assert.deepEqual(Web3.givenProvider, global.ethereumProvider); | ||
|
||
}); | ||
|
||
it('when instantiating Eth', function () { | ||
|
||
var Eth = require('../packages/web3-eth'); | ||
|
||
it('when instantiating Eth', () => { | ||
// eslint-disable-next-line global-require | ||
const Eth = require('../packages/web3-eth'); | ||
assert.deepEqual(Eth.givenProvider, global.ethereumProvider); | ||
|
||
}); | ||
|
||
it('when instantiating Bzz', function () { | ||
|
||
var Bzz = require('../packages/web3-bzz'); | ||
|
||
it('when instantiating Bzz', () => { | ||
// eslint-disable-next-line global-require | ||
const Bzz = require('../packages/web3-bzz'); | ||
assert.deepEqual(Bzz.givenProvider, global.ethereumProvider.bzz); | ||
|
||
}); | ||
|
||
}); | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,21 @@ | ||
var chai = require('chai'); | ||
var assert = chai.assert; | ||
import { assert } from 'chai'; | ||
|
||
global.web3 = { | ||
currentProvider: {bzz: 'http://givenProvider:8500'} | ||
currentProvider: { bzz: 'http://givenProvider:8500' } | ||
}; | ||
|
||
|
||
describe('Web3.providers.givenProvider', function () { | ||
describe('should be set if web3.currentProvider is available ', function () { | ||
|
||
it('when instantiating Web3', function () { | ||
|
||
var Web3 = require('../packages/web3'); | ||
|
||
describe('Web3.providers.givenProvider', () => { | ||
describe('should be set if web3.currentProvider is available ', () => { | ||
it('when instantiating Web3', () => { | ||
// eslint-disable-next-line global-require | ||
const Web3 = require('../packages/web3'); | ||
assert.deepEqual(Web3.givenProvider, global.web3.currentProvider); | ||
|
||
}); | ||
|
||
it('when instantiating Eth', function () { | ||
|
||
var Eth = require('../packages/web3-eth'); | ||
|
||
it('when instantiating Eth', () => { | ||
// eslint-disable-next-line global-require | ||
const Eth = require('../packages/web3-eth'); | ||
assert.deepEqual(Eth.givenProvider, global.web3.currentProvider); | ||
|
||
}); | ||
}); | ||
}); | ||
|
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.