Merge pull request #262 from ethereum/ballot

Move ballot example into src/app/example-contracts
pull/1/head
yann300 8 years ago committed by GitHub
commit e52e761046
  1. 4
      index.html
  2. 1
      package.json
  3. 13
      src/app/editor.js
  4. 35
      src/app/example-contracts.js
  5. 4
      test-browser/mockcompiler/requests.js
  6. 2
      test-browser/tests/ballot.js
  7. 2
      test-browser/tests/simpleContract.js

@ -35,13 +35,9 @@
<link rel="stylesheet" href="assets/css/font-awesome.min.css">
<link rel="icon" type="x-icon" href="icon.png">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<script src="assets/js/ballot.sol.js"></script>
</head>
<body>
<div id="editor">
<span class="newFile" title="New File"><i class="fa fa-file-code-o"></i></span>
<span class="uploadFile" title="Upload"><label class="fa fa-upload"><input type="file" class="inputFile" multiple /></label></span>

@ -59,7 +59,6 @@
"private": true,
"semistandard": {
"ignore": [
"assets/js/",
"build/",
"src/mode-solidity.js",
"nightwatch.js",

@ -1,7 +1,8 @@
/* global BALLOT_EXAMPLE, FileReader */
/* global FileReader */
'use strict';
var utils = require('./utils');
var examples = require('./example-contracts');
var ace = require('brace');
require('../mode-solidity.js');
@ -169,16 +170,10 @@ function Editor (loadingFromGist, storage) {
}
function setupStuff (files) {
var untitledCount = '';
if (files.length === 0) {
if (loadingFromGist) return;
// Backwards-compatibility
while (storage.exists(SOL_CACHE_UNTITLED + untitledCount)) {
untitledCount = (untitledCount - 0) + 1;
}
SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount;
files.push(SOL_CACHE_FILE);
storage.set(SOL_CACHE_FILE, BALLOT_EXAMPLE); // defined in assets/js/ballot.sol.js
files.push(utils.fileKey(examples.ballot.name));
storage.set(utils.fileKey(examples.ballot.name), examples.ballot.content);
}
SOL_CACHE_FILE = files[0];

@ -1,30 +1,4 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2014, 2015, the individual contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
var multi = function (func) { return func.toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1]; };
var BALLOT_EXAMPLE = multi(function () { /*pragma solidity ^0.4.0;
var ballot = `pragma solidity ^0.4.0;
contract Ballot {
struct Voter {
@ -88,5 +62,8 @@ contract Ballot {
winningProposal = proposal;
}
}
}
*/});
}`;
module.exports = {
ballot: { name: 'ballot.sol', content: ballot }
};

@ -1,12 +1,12 @@
module.exports = {
'testSimpleContract': {
'sources': {
'Untitled1': 'contract test1 {} contract test2 {}'
'Untitled': 'contract test1 {} contract test2 {}'
}
},
'ballot': {
'sources': {
'Untitled1': `pragma solidity ^0.4.0;
'Untitled': `pragma solidity ^0.4.0;
contract Ballot {
struct Voter {

@ -14,7 +14,7 @@ function runTests (browser, testData) {
.waitForElementVisible('.newFile', 10000);
browser.assert.notEqual(testData, null);
// TODO add Ballot tests. -> setValue('#input textarea', ... ) is not working properly with that contract.
/* testBallot(browser, testData.ballot.sources.Untitled1, function () {
/* testBallot(browser, testData.ballot.sources.Untitled, function () {
browser.end();
});*/
}

@ -13,7 +13,7 @@ function runTests (browser, testData) {
.url('http://127.0.0.1:8080/#version=builtin')
.waitForElementVisible('.newFile', 10000);
browser.assert.notEqual(testData, null);
testSimpleContract(browser, testData.testSimpleContract.sources.Untitled1, function () {
testSimpleContract(browser, testData.testSimpleContract.sources.Untitled, function () {
browser.end();
});
}

Loading…
Cancel
Save