Merge pull request mvs-org#123 from mvs-org/dev

Continuous integration

Author: canguruhh

.travis.yml

@@ -0,0 +1,24 @@
+sudo: required
+addons:
+  addons:
+  chrome: stable
+  apt:
+    packages:
+      - chromium-chromedriver
+language: node_js
+node_js:
+  - 8
+cache:
+  directories:
+    - node_modules
+before_script:
+  - export DISPLAY=:99.0
+  - export PATH=$PATH:/usr/lib/chromium-browser/
+  - ./node_modules/ionic/bin/ionic serve --no-open &
+  - sleep 30
+install:
+  - npm install
+  - npm run e2e-update
+script:
+  - npm run e2e
+

e2e/app.e2e-spec.ts

@@ -1,26 +1,26 @@
 import { Page } from './app.po';
 
 describe('App', () => {
-  let page: Page;
+    let page: Page;
 
-  beforeEach(() => {
-    page = new Page();
-  });
-
-  describe('open wallet', () => {
     beforeEach(() => {
-      page.navigateTo('/');
+        page = new Page();
     });
 
-    it('should have an open wallet button', () => {
-      page.hasOpenWalletButton().then(res => {
-        expect(res).toEqual(true);
-      });
-    });
-    it('should have a title saying Login', () => {
-      page.getTitle().then(title => {
-        expect(title).toEqual('MyETPWallet.com');
-      });
-    });
-  })
+    describe('open wallet', () => {
+        beforeEach(() => {
+            page.navigateTo('/');
+        });
+
+        it('should have an open wallet button', () => {
+            page.hasId("open-wallet-button").then(res => {
+                expect(res).toEqual(true);
+            });
+        });
+        it('should have a title saying Login', () => {
+            page.getTitle().then(title => {
+                expect(title).toEqual('Metaverse Lightwallet');
+            });
+        });
+    })
 });

e2e/app.po.ts

@@ -2,16 +2,18 @@ import { browser, element, by } from 'protractor';
 
 export class Page {
 
-  navigateTo(destination) {
-    return browser.get(destination);
-  }
+    navigateTo(destination) {
+        return browser.get(destination);
+    }
+
+    getTitle() {
+        return browser.getTitle();
+    }
 
-  getTitle() {
-    return browser.getTitle();
-  }
+    getElementById = (id) => element(by.id(id))
 
-    hasOpenWalletButton(){
-        return browser.isElementPresent(element(by.id("close-wallet-button")))
+    hasId(id) {
+        return browser.isElementPresent(this.getElementById(id))
     }
-  
+
 }

e2e/create-wallet.e2e-spec.ts

@@ -1,26 +1,41 @@
 import { Page } from './app.po';
 
 describe('Wallet creation', () => {
-  let page: Page;
 
-  beforeEach(() => {
-    page = new Page();
-  });
+    let page: Page;
 
-  describe('open wallet', () => {
     beforeEach(() => {
-      page.navigateTo('/');
+        page = new Page();
     });
 
-    it('should have an open wallet button', () => {
-      page.hasOpenWalletButton().then(res => {
-        expect(res).toEqual(true);
-      });
-    });
-    it('should have a title saying Login', () => {
-      page.getTitle().then(title => {
-        expect(title).toEqual('MyETPWallet.com');
-      });
-    });
-  })
+    describe('Load login page', () => {
+        beforeEach(() => {
+            page.navigateTo('/');
+        });
+
+        it('Login should have an create wallet button', () => {
+            page.hasId("create-wallet-button").then(res => {
+                expect(res).toEqual(true);
+            });
+        });
+        it('Login should have correct title', () => {
+            page.getTitle().then(title => {
+                expect(title).toEqual('Metaverse Lightwallet');
+            });
+        });
+    })
+
+    describe('Gerneate new wallet', () => {
+        beforeEach(() => {
+            page.navigateTo('/');
+            page.getElementById("create-wallet-button").click()
+        });
+
+        it('Page should have backup words', () => {
+            page.hasId("backup-words").then(res => {
+                expect(res).toEqual(true);
+            });
+        });
+    })
+
 });

src/app/app.component.spec.ts

@@ -5,6 +5,9 @@ import { ErrorHandler, NgModule } from '@angular/core';
 import { WalletServiceProvider } from '../providers/wallet-service/wallet-service';
 import { MvsServiceProvider } from '../providers/mvs-service/mvs-service';
 import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
+import { SplashScreen } from '@ionic-native/splash-screen';
+import { StatusBar } from '@ionic-native/status-bar';
+import { Keyboard } from '@ionic-native/keyboard';
 
 
 import { BrowserModule } from '@angular/platform-browser';
@@ -20,20 +23,20 @@ export function HttpLoaderFactory(http: Http) {
     return new TranslateHttpLoader(http, '/assets/i18n/', '.json');
 }
 
-describe('MyApp Component', () => {
+describe('MyETPWallet Component', () => {
     let fixture;
     let component;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
-            declarations: [MyApp],
+            declarations: [MyETPWallet],
             imports: [
-                IonicModule.forRoot(MyApp),
+                IonicModule.forRoot(MyETPWallet),
                 BrowserModule,
                 QRCodeModule,
                 HttpModule,
                 ClipboardModule,
-                IonicModule.forRoot(MyApp),
+                IonicModule.forRoot(MyETPWallet),
                 TranslateModule.forRoot({
                     loader: {
                         provide: TranslateLoader,
@@ -50,6 +53,9 @@ describe('MyApp Component', () => {
                 AppGlobals,
                 { provide: ErrorHandler, useClass: IonicErrorHandler },
                 MvsServiceProvider,
+                Keyboard,
+                StatusBar,
+                SplashScreen,
                 WalletServiceProvider
             ]
         })
@@ -58,19 +64,13 @@ describe('MyApp Component', () => {
 
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(MyApp);
+        fixture = TestBed.createComponent(MyETPWallet);
         component = fixture.componentInstance;
     });
 
 
     it('should be created', () => {
-        expect(component instanceof MyApp).toBe(true);
-    });
-
-    it('should have two pages', () => {
-      setTimeout(()=>{
-          expect(component.pages.length).toBe(true)
-      },1000)
+        expect(component instanceof MyETPWallet).toBe(true);
     });
 
 });

src/pages/generate-key/generate-key.html

@@ -19,7 +19,7 @@ <h1>{{'YOUR_MNEMONIC_WORDS'|translate}}</h1>
         <ion-row class="card-content">
             <ion-col center text-center>
                 <h1 class="center">
-                    <div>{{wallet.mnemonic}}</div>
+                    <div id="backup-words">{{wallet.mnemonic}}</div>
                 </h1>
             </ion-col>
         </ion-row>

src/pages/login/login.html

@@ -20,13 +20,13 @@ <h1 style="text-align: center;" *ngIf="globals.network=='testnet'">Testnet</h1>
             <div style="text-align: center;">{{version()}}</div>
         </div>
         <ion-row class="browser-button">
-            <button ion-button class="large-btn" block full icon-left (click)="GenerateKeyPage();">
+            <button ion-button class="large-btn" block full icon-left (click)="GenerateKeyPage();" id="create-wallet-button">
                 <ion-icon name="add"></ion-icon>
                 {{"CREATE_NEW_WALLET_BUTTON"|translate}}
             </button>
         </ion-row>
         <ion-row *ngIf="!platform.is('mobile')" class="browser-button">
-            <button ion-button class="large-btn" block full icon-left (click)="ImportMnemonicPage();">
+            <button ion-button class="large-btn" block full icon-left (click)="ImportMnemonicPage();" id="create-wallet-frombackup-button">
                 <ion-icon name="download"></ion-icon>
                 {{"CREATE_FROM_BACKUP_WORDS"|translate}}
             </button>

src/providers/wallet-service/wallet-service.spec.ts

@@ -1,6 +1,7 @@
 import { async, TestBed } from '@angular/core/testing';
-
+import { AppGlobals } from '../../app/app.global';
 import { WalletServiceProvider } from './wallet-service';
+import { CryptoServiceProvider } from '../crypto-service/crypto-service';
 import { IonicStorageModule } from '@ionic/storage';
 import { Storage } from '@ionic/storage';
 
@@ -12,14 +13,32 @@ describe('Wallet Provider', () => {
         new Storage({
             name: '__myetpwallet',
             driverOrder: ['indexeddb', 'localstorage']
-        }), undefined, undefined)
+        }), new AppGlobals(), new CryptoServiceProvider())
+    });
+
+    it('Generate Wallet', (done)=> {
+        let passphrase = 'passphrase123'
+        let wallet = null;
+        return walletservice.createWallet()
+            .then(result=>{
+                expect(result !=undefined && result.mnemonic!==undefined).toBe(true)
+                done()
+            })
     });
 
-    it('Storage', (done)=> {
-        walletservice.setA()
-            .then(function(){ console.log(1); return walletservice.getA()})
-            .then(function(result){
-                expect(result).toBe(1)
+    it('Store and retrieve Wallet', (done)=> {
+        let passphrase = 'passphrase123'
+        let wallet = null;
+        return walletservice.createWallet()
+            .then(result=>{
+                expect(result !=undefined && result.mnemonic!==undefined).toBe(true)
+                wallet=result;
+                return walletservice.encryptWalletFromMnemonic(wallet.mnemonic, passphrase)
+            })
+            .then(wallet=>walletservice.setWallet(wallet))
+            .then(wallet=>walletservice.getMnemonic(passphrase))
+            .then((mnemonic)=>{
+                expect(mnemonic).toBe(wallet.mnemonic)
                 done()
             })
     });

src/providers/wallet-service/wallet-service.ts

@@ -17,6 +17,16 @@ export class WalletServiceProvider {
             .then((seed) => this.crypto.encrypt(seed.toString('hex'), passphrase))
     }
 
+    encryptWalletFromMnemonic(mnemonic, passphrase){
+        return this.crypto.encrypt(mnemonic, passphrase)
+            .then((res) => this.dataToKeystoreJson(res))
+    }
+
+    dataToKeystoreJson(mnemonic) {
+        let tmp = { version: this.globals.version, algo: this.globals.algo, index: this.globals.index, mnemonic: mnemonic };
+        return tmp;
+    }
+
     getMstIcons() {
         return ['ETP', 'MVS.ZGC', 'MVS.ZDC', 'CSD.CSD', 'PARCELX.GPX', 'PARCELX.TEST', 'SDG', 'META', 'MVS.HUG'];
     }

test-config/protractor.conf.js

@@ -5,28 +5,31 @@
 var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
 
 exports.config = {
-  allScriptsTimeout: 11000,
-  specs: [
-    '../e2e/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    'browserName': 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:8100/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  useAllAngular2AppRoots: true,
-  beforeLaunch: function() {
-    require('ts-node').register({
-      project: 'e2e'
-    });
-  },
-  onPrepare: function() {
-    jasmine.getEnv().addReporter(new SpecReporter());
-  }
+    allScriptsTimeout: 11000,
+    specs: [
+        '../e2e/**/*.e2e-spec.ts'
+    ],
+    capabilities: {
+        'browserName': 'chrome',
+        chromeOptions: {
+            args: ['--headless', '--disable-gpu', '--window-size=800,600', '--no-sandbox']
+        }
+    },
+    directConnect: true,
+    baseUrl: 'http://localhost:8100/',
+    framework: 'jasmine',
+    jasmineNodeOpts: {
+        showColors: true,
+        defaultTimeoutInterval: 30000,
+        print: function() {}
+    },
+    useAllAngular2AppRoots: true,
+    beforeLaunch: function() {
+        require('ts-node').register({
+            project: 'e2e'
+        });
+    },
+    onPrepare: function() {
+        jasmine.getEnv().addReporter(new SpecReporter());
+    }
 };