From 77c675de369bb25148201622fe839c8d867a3e05 Mon Sep 17 00:00:00 2001 From: FranzPoize Date: Tue, 16 Feb 2016 00:17:59 +0100 Subject: [PATCH] fix plan and params --- app/scripts/components/account.components.jsx | 5 ++- test/Views/toggling.views.js | 8 ++-- test/base.test.js | 10 ++--- test/baseUI/sidebar.test.js | 21 ++++++++-- test/baseUI/topbar.test.js | 8 ++-- test/subscriptionRights/params.test.js | 40 +++++++++++++++++++ 6 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 test/subscriptionRights/params.test.js diff --git a/app/scripts/components/account.components.jsx b/app/scripts/components/account.components.jsx index 26d61df3f..8f31b94d7 100644 --- a/app/scripts/components/account.components.jsx +++ b/app/scripts/components/account.components.jsx @@ -56,7 +56,10 @@ export default class Account extends React.Component {

My subscription

{(() => { - if (HoodieApi.instance.plan.indexOf('free_') > -1) { + if (!HoodieApi.instance.plan) { + return 'All privileges'; + } + else if (HoodieApi.instance.plan.indexOf('free_') > -1) { return 'Free plan'; } else if (HoodieApi.instance.plan.indexOf('annual_') > -1) { diff --git a/test/Views/toggling.views.js b/test/Views/toggling.views.js index e64dbd66e..4518ed42d 100644 --- a/test/Views/toggling.views.js +++ b/test/Views/toggling.views.js @@ -2,12 +2,12 @@ module.exports = { before: function(browser, done) { browser .init() - .waitForElementVisible('input#email-sign-in', 10000) - .setValue('input#email-sign-in',process.env.PROTOTYPO_LOGIN) + .waitForElementVisible('input#email-sign-in', 20000) + .setValue('input#email-sign-in', 'test@registered-annual.com') .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) .click('input[type=submit]') - .pause(10000) - .waitForElementVisible('#dashboard', 10000, false, done); + .pause(20000) + .waitForElementVisible('#dashboard', 20000, false, done); }, after: function(browser) { browser.end(); diff --git a/test/base.test.js b/test/base.test.js index f49edf6dc..48e7976ec 100644 --- a/test/base.test.js +++ b/test/base.test.js @@ -2,23 +2,23 @@ module.exports = { 'Test login': function(browser) { browser .init() - .waitForElementVisible('input#email-sign-in', 10000) - .setValue('input#email-sign-in',process.env.PROTOTYPO_LOGIN) + .waitForElementVisible('input#email-sign-in', 20000) + .setValue('input#email-sign-in','test@registered-monthly.com') .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) .click('input[type=submit]') .pause(2000) - .waitForElementVisible('#dashboard', 10000) + .waitForElementVisible('#dashboard', 20000) .end(); }, 'Test login fail': function(browser) { browser .init() - .waitForElementVisible('input#email-sign-in', 10000) + .waitForElementVisible('input#email-sign-in', 20000) .setValue('input#email-sign-in', "test@no-registered.com") .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) .click('input[type=submit]') .pause(2000) - .waitForElementVisible('.warning-message', 10000) + .waitForElementVisible('.warning-message', 20000) .end(); } }; diff --git a/test/baseUI/sidebar.test.js b/test/baseUI/sidebar.test.js index 0f9aecf8a..523d60978 100644 --- a/test/baseUI/sidebar.test.js +++ b/test/baseUI/sidebar.test.js @@ -2,12 +2,12 @@ module.exports = { before: function(browser, done) { browser .init() - .waitForElementVisible('input#email-sign-in', 10000) - .setValue('input#email-sign-in',process.env.PROTOTYPO_LOGIN) + .waitForElementVisible('input#email-sign-in', 20000) + .setValue('input#email-sign-in', 'test@registered-annual.com') .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) .click('input[type=submit]') .pause(2000) - .waitForElementVisible('#dashboard', 10000, done); + .waitForElementVisible('#dashboard', 20000, done); }, after: function(browser) { browser.end(); @@ -27,9 +27,22 @@ module.exports = { .click('div[name=help-panel]') .waitForElementVisible('.help-panel', 2000); }, - 'Should display profile' : function (browser) { + 'Should display news feed' : function (browser) { browser .click('div[name=news-feed]') .waitForElementVisible('.news-feed', 2000) + .end() + }, + 'Should display profile when kickstarter' : function (browser) { + browser + .init() + .waitForElementVisible('input#email-sign-in', 20000) + .setValue('input#email-sign-in', 'test@registered-kickstarter.com') + .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) + .click('input[type=submit]') + .pause(2000) + .waitForElementVisible('#dashboard', 20000) + .click('div[name=subscriptions]') + .waitForElementVisible('.account', 2000); }, }; diff --git a/test/baseUI/topbar.test.js b/test/baseUI/topbar.test.js index e980255f2..bcf5fe2dd 100644 --- a/test/baseUI/topbar.test.js +++ b/test/baseUI/topbar.test.js @@ -2,12 +2,12 @@ module.exports = { before: function(browser, done) { browser .init() - .waitForElementVisible('input#email-sign-in', 10000) - .setValue('input#email-sign-in',process.env.PROTOTYPO_LOGIN) + .waitForElementVisible('input#email-sign-in', 20000) + .setValue('input#email-sign-in', 'test@registered-annual.com') .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) .click('input[type=submit]') - .pause(10000) - .waitForElementVisible('#dashboard', 10000, false, done); + .pause(20000) + .waitForElementVisible('#dashboard', 20000, false, done); }, after: function(browser) { browser.end(); diff --git a/test/subscriptionRights/params.test.js b/test/subscriptionRights/params.test.js new file mode 100644 index 000000000..b395a2a1d --- /dev/null +++ b/test/subscriptionRights/params.test.js @@ -0,0 +1,40 @@ +module.exports = { + 'Should have access to all params': function(browser) { + browser + .init() + .waitForElementVisible('input#email-sign-in', 20000) + .setValue('input#email-sign-in', 'test@registered-annual.com') + .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) + .click('input[type=submit]') + .pause(2000) + .waitForElementVisible('#dashboard', 20000) + .click('.controls-tabs-icon:nth-child(1)') + .pause(200) + .elements('css selector', '.sliders .slider', function(result) { + browser.assert.equal(result.value.length, 9); + }) + .elements('css selector', '.sliders .slider.is-disabled', function(result) { + browser.assert.equal(result.value.length, 0); + }) + .end(); + }, + 'Should not have access to all params': function(browser) { + browser + .init() + .waitForElementVisible('input#email-sign-in', 20000) + .setValue('input#email-sign-in', 'test@registered-free.com') + .setValue('input#password-sign-in', process.env.PROTOTYPO_PASS) + .click('input[type=submit]') + .pause(2000) + .waitForElementVisible('#dashboard', 20000) + .click('.controls-tabs-icon:nth-child(1)') + .pause(200) + .elements('css selector', '.sliders .slider', function(result) { + browser.assert.equal(result.value.length, 9); + }) + .elements('css selector', '.sliders .slider.is-disabled', function(result) { + browser.assert.equal(result.value.length, 7); + }) + .end(); + } +};