summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-09-04 13:08:44 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-09-04 13:26:11 +0200
commit9b4ca3b9d73255ee573cf12c69893208326682fe (patch)
tree4818423a3e26b568ba20c8b1ec484d1bf5effd2f /test
parentfb1ae90a3b4fdb1601a4602929b62d706fb5192e (diff)
downloadmullvadvpn-9b4ca3b9d73255ee573cf12c69893208326682fe.tar.xz
mullvadvpn-9b4ca3b9d73255ee573cf12c69893208326682fe.zip
Change accountNumber to accountToken
Diffstat (limited to 'test')
-rw-r--r--test/autologin.spec.js10
-rw-r--r--test/components/Account.spec.js6
-rw-r--r--test/components/Login.spec.js2
-rw-r--r--test/components/Settings.spec.js6
-rw-r--r--test/login.spec.js2
-rw-r--r--test/logout.spec.js2
-rw-r--r--test/mocks/ipc.js4
-rw-r--r--test/mocks/redux.js2
8 files changed, 17 insertions, 17 deletions
diff --git a/test/autologin.spec.js b/test/autologin.spec.js
index b8051d800b..734e81d479 100644
--- a/test/autologin.spec.js
+++ b/test/autologin.spec.js
@@ -9,16 +9,16 @@ describe('autologin', () => {
it('should send get_account then get_account_data if an account is set', (done) => {
const { mockIpc, backend } = setupBackendAndStore();
- const randomAccountNumber = '12345';
+ const randomAccountToken = '12345';
const chain = new IpcChain(mockIpc);
chain.require('getAccount')
- .withReturnValue(randomAccountNumber)
+ .withReturnValue(randomAccountToken)
.done();
chain.require('getAccountData')
.withInputValidation((num) => {
- expect(num).to.equal(randomAccountNumber);
+ expect(num).to.equal(randomAccountToken);
})
.done();
@@ -60,7 +60,7 @@ describe('autologin', () => {
const state = store.getState().account;
expect(state.status).to.equal('none');
- expect(state.accountNumber).to.be.null;
+ expect(state.accountToken).to.be.null;
expect(state.error).to.be.null;
});
});
@@ -91,7 +91,7 @@ describe('autologin', () => {
.then( () => {
const state = store.getState().account;
expect(state.status).to.equal('ok');
- expect(state.accountNumber).to.equal('123');
+ expect(state.accountToken).to.equal('123');
expect(state.expiry).to.equal('2001-01-01T00:00:00Z');
});
});
diff --git a/test/components/Account.spec.js b/test/components/Account.spec.js
index 6ebd4785e2..4f574ae6d7 100644
--- a/test/components/Account.spec.js
+++ b/test/components/Account.spec.js
@@ -10,7 +10,7 @@ import type { AccountProps } from '../../app/components/Account';
describe('components/Account', () => {
const state: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2038-01-01')).toISOString(),
status: 'none',
error: null
@@ -58,7 +58,7 @@ describe('components/Account', () => {
it('should display "out of time" message when account expired', () => {
const expiredState: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2001-01-01')).toISOString(),
status: 'none',
error: null
@@ -73,4 +73,4 @@ describe('components/Account', () => {
expect(domNodes.length).to.be.equal(0);
});
-}); \ No newline at end of file
+});
diff --git a/test/components/Login.spec.js b/test/components/Login.spec.js
index 3af6cb041b..d3d38be410 100644
--- a/test/components/Login.spec.js
+++ b/test/components/Login.spec.js
@@ -84,7 +84,7 @@ describe('components/Login', () => {
});
const defaultAccount = {
- accountNumber: null,
+ accountToken: null,
expiry: null,
status: 'none',
error: null,
diff --git a/test/components/Settings.spec.js b/test/components/Settings.spec.js
index fd670931e8..63087c5088 100644
--- a/test/components/Settings.spec.js
+++ b/test/components/Settings.spec.js
@@ -12,21 +12,21 @@ import type { SettingsProps } from '../../app/components/Settings';
describe('components/Settings', () => {
const loggedOutAccountState: AccountReduxState = {
- accountNumber: null,
+ accountToken: null,
expiry: null,
status: 'none',
error: null
};
const loggedInAccountState: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2038-01-01')).toISOString(),
status: 'ok',
error: null
};
const unpaidAccountState: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2001-01-01')).toISOString(),
status: 'ok',
error: null
diff --git a/test/login.spec.js b/test/login.spec.js
index 21564da822..1efe89ae38 100644
--- a/test/login.spec.js
+++ b/test/login.spec.js
@@ -38,7 +38,7 @@ describe('Logging in', () => {
.then( () => {
const state = store.getState().account;
expect(state.status).to.equal('ok');
- expect(state.accountNumber).to.equal('123');
+ expect(state.accountToken).to.equal('123');
expect(state.expiry).to.equal('2001-01-01T00:00:00Z');
});
});
diff --git a/test/logout.spec.js b/test/logout.spec.js
index a5c8b29975..9b44f83ca6 100644
--- a/test/logout.spec.js
+++ b/test/logout.spec.js
@@ -35,7 +35,7 @@ describe('logging out', () => {
const expectedLogoutState = {
status: 'none',
- accountNumber: null,
+ accountToken: null,
expiry: null,
error: null,
};
diff --git a/test/mocks/ipc.js b/test/mocks/ipc.js
index 3acdc2f76d..d28c49e6f6 100644
--- a/test/mocks/ipc.js
+++ b/test/mocks/ipc.js
@@ -15,9 +15,9 @@ export function newMockIpc() {
const mockIpc: IpcFacade & MockIpc = {
setConnectionString: (_str: string) => {},
- getAccountData: (accountNumber) => {
+ getAccountData: (accountToken) => {
return new Promise(r => r({
- accountNumber: accountNumber,
+ accountToken: accountToken,
expiry: '',
}));
},
diff --git a/test/mocks/redux.js b/test/mocks/redux.js
index 9d4759b1d3..71dafc7f1f 100644
--- a/test/mocks/redux.js
+++ b/test/mocks/redux.js
@@ -7,7 +7,7 @@ export const mockStore = configureMockStore(middlewares);
export const mockState = () => {
return {
account: {
- accountNumber: null,
+ accountToken: null,
status: 'none',
error: null
},