summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-08-24 14:31:18 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-08-24 14:40:49 +0200
commit81cc03093c05d54d79804595dd0354b1f878cdcd (patch)
treed7353b3beba6ef6470b68c6077e60af11e39c927 /test
parent5a049320011473baa133f86946688ba3928e63e4 (diff)
downloadmullvadvpn-81cc03093c05d54d79804595dd0354b1f878cdcd.tar.xz
mullvadvpn-81cc03093c05d54d79804595dd0354b1f878cdcd.zip
Replace paidUntil with expiry
Diffstat (limited to 'test')
-rw-r--r--test/components/Account.spec.js4
-rw-r--r--test/components/Connect.spec.js3
-rw-r--r--test/components/Login.spec.js2
-rw-r--r--test/components/Settings.spec.js6
-rw-r--r--test/logout.spec.js2
5 files changed, 8 insertions, 9 deletions
diff --git a/test/components/Account.spec.js b/test/components/Account.spec.js
index 4372ac957e..6ebd4785e2 100644
--- a/test/components/Account.spec.js
+++ b/test/components/Account.spec.js
@@ -11,7 +11,7 @@ import type { AccountProps } from '../../app/components/Account';
describe('components/Account', () => {
const state: AccountReduxState = {
accountNumber: '1234',
- paidUntil: (new Date('2038-01-01')).toISOString(),
+ expiry: (new Date('2038-01-01')).toISOString(),
status: 'none',
error: null
};
@@ -59,7 +59,7 @@ describe('components/Account', () => {
it('should display "out of time" message when account expired', () => {
const expiredState: AccountReduxState = {
accountNumber: '1234',
- paidUntil: (new Date('2001-01-01')).toISOString(),
+ expiry: (new Date('2001-01-01')).toISOString(),
status: 'none',
error: null
};
diff --git a/test/components/Connect.spec.js b/test/components/Connect.spec.js
index 13700e8cca..d7a20daf2d 100644
--- a/test/components/Connect.spec.js
+++ b/test/components/Connect.spec.js
@@ -49,8 +49,7 @@ const defaultProps = {
onExternalLink: noop,
getServerInfo: (_) => { return defaultServer; },
- accountPaidUntil: '',
+ accountExpiry: '',
preferredServer: '',
connection: defaultConnection,
};
-
diff --git a/test/components/Login.spec.js b/test/components/Login.spec.js
index d0874d4b74..3af6cb041b 100644
--- a/test/components/Login.spec.js
+++ b/test/components/Login.spec.js
@@ -85,7 +85,7 @@ describe('components/Login', () => {
const defaultAccount = {
accountNumber: null,
- paidUntil: null,
+ expiry: null,
status: 'none',
error: null,
};
diff --git a/test/components/Settings.spec.js b/test/components/Settings.spec.js
index 705da60098..fd670931e8 100644
--- a/test/components/Settings.spec.js
+++ b/test/components/Settings.spec.js
@@ -13,21 +13,21 @@ import type { SettingsProps } from '../../app/components/Settings';
describe('components/Settings', () => {
const loggedOutAccountState: AccountReduxState = {
accountNumber: null,
- paidUntil: null,
+ expiry: null,
status: 'none',
error: null
};
const loggedInAccountState: AccountReduxState = {
accountNumber: '1234',
- paidUntil: (new Date('2038-01-01')).toISOString(),
+ expiry: (new Date('2038-01-01')).toISOString(),
status: 'ok',
error: null
};
const unpaidAccountState: AccountReduxState = {
accountNumber: '1234',
- paidUntil: (new Date('2001-01-01')).toISOString(),
+ expiry: (new Date('2001-01-01')).toISOString(),
status: 'ok',
error: null
};
diff --git a/test/logout.spec.js b/test/logout.spec.js
index 503c2e703a..a5c8b29975 100644
--- a/test/logout.spec.js
+++ b/test/logout.spec.js
@@ -36,7 +36,7 @@ describe('logging out', () => {
const expectedLogoutState = {
status: 'none',
accountNumber: null,
- paidUntil: null,
+ expiry: null,
error: null,
};