Attempt to fix tests

.yarnrc.yml

@@ -1 +1,5 @@
 nodeLinker: node-modules
+
+plugins:
+ - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+ spec: "@yarnpkg/plugin-workspace-tools"

package.json

@@ -17,7 +17,7 @@
  "xcloudapi": "yarn workspace @greenlight/xcloudapi",
  "webapi": "yarn workspace @greenlight/webapi",
  "platform": "yarn workspace @greenlight/platform",
- "test": "yarn logger test && yarn authentication test && yarn storeapi test && yarn xcloudapi test"
+ "test": "yarn authentication test && yarn logger test && yarn storeapi test && yarn xcloudapi test && yarn webapi test && yarn platform test"
  },
  "workspaces": [
  "app",

packages/authentication/src/authstore.ts

@@ -37,9 +37,9 @@ export default class AuthStore extends TokenStore {
 }
 
 const getAppBasePath = () => {
- let ElectronAppName = '@greenlight/app2 (development)'
+ let ElectronAppName = '@greenlight/app3 (development)'
  if(process.env.NODE_ENV === 'production')
- ElectronAppName = '@greenlight/app'
+ ElectronAppName = '@greenlight/app3'
 
  if(app !== undefined && app.getPath !== undefined)
  return app.getPath('userData')

packages/platform/src/controllers/app.ts

@@ -0,0 +1,15 @@
+import GreenlightPlatform from '..'
+
+export default class App {
+
+ private _platform:GreenlightPlatform
+
+ constructor(platform:GreenlightPlatform){
+ this._platform = platform
+ }
+
+ ping() {
+ return 'pong'
+ }
+
+}

packages/platform/src/controllers/index.ts

@@ -1,7 +1,9 @@
 import Authentication from './authentication'
 import Gamepass from './gamepass'
+import App from './app'
 
 export default {
  Authentication: Authentication,
- Gamepass: Gamepass
+ Gamepass: Gamepass,
+ App: App,
 }

packages/platform/src/index.ts

@@ -3,8 +3,7 @@ import Logger from '@greenlight/logger'
 
 import PlatformWorker, { WorkerMessage, WorkerMessageResponse } from './worker'
 
-import Authentication from './controllers/authentication'
-import Gamepass from './controllers/gamepass'
+import Controllers from './controllers'
 
 export default class GreenlightPlatform {
 
@@ -14,8 +13,9 @@ export default class GreenlightPlatform {
  private _platformWorker?:PlatformWorker
 
  public api = {
- Authentication: new Authentication(this),
- Gamepass: new Gamepass(this),
+ App: new Controllers.App(this),
+ Authentication: new Controllers.Authentication(this),
+ Gamepass: new Controllers.Gamepass(this),
  }
 
  constructor() {

packages/platform/tests/main.ts

@@ -1,12 +1,37 @@
-import GreenlightPlatform from '../src/index'
+import GreenlightPlatform from '../dist/index'
 import { expect } from 'chai'
 
 describe('GreenlightPlatform', () => {
 
  describe('new instance', () => {
  it('should create an instance of GreenlightPlatform', function(){
- const auth = new GreenlightPlatform()
- expect(auth).to.be.an.instanceOf(GreenlightPlatform)
+ const platform = new GreenlightPlatform()
+ expect(platform).to.be.an.instanceOf(GreenlightPlatform)
+ })
+ })
+
+ describe('load worker', () => {
+ it('should be able to load', async function(){
+ const platform = new GreenlightPlatform()
+ expect(platform).to.be.an.instanceOf(GreenlightPlatform)
+
+ const workerState = await platform.loadWorker()
+ expect(workerState).to.be.oneOf([true, false])
+
+ await platform.close()
+ })
+
+ it('should be able to retrieve data', async function(){
+ const platform = new GreenlightPlatform()
+ expect(platform).to.be.an.instanceOf(GreenlightPlatform)
+
+ const workerState = await platform.loadWorker()
+ expect(workerState).to.be.oneOf([true, false])
+
+ const pingReply = await platform.api.App.ping()
+ expect(pingReply).to.equal('pong')
+
+ await platform.close()
  })
  })
 })

packages/storeapi/tests/main.ts

@@ -1,5 +1,4 @@
 import StoreApi from '../src/index'
-import { Xal } from 'xal-node'
 
 import { expect } from 'chai'
 

packages/webapi/tests/main.ts

@@ -7,8 +7,11 @@ describe('WebApi', () => {
  describe('new instance', () => {
  it('should create an instance of WebApi', function(){
  const auth = new WebApi({
- host: 'dummy',
- token: 'dummytoken'
+ uhs: 'dummy',
+ token: {
+ Token: 'dummytoken',
+ NotAfter: '0'
+ }
  })
  expect(auth).to.be.an.instanceOf(WebApi)
  })