Skip to content

GitLab

Commit 3e297482 authored by Curtis Adam's avatar Curtis Adam
Browse files

Update current chimp tests

parent de383008
Hide whitespace changes
Inline Side-by-side
client/themeSwitcher.scss
View file @ 3e297482
......@@ -148,6 +148,12 @@ $themes: (
$navbar_personal_text: map-get($map, "navbar_personal_text");
$navbar_personal_text_hover: map-get($map, "navbar_personal_text_hover");
$navbar_personal_text_active: map-get($map, "navbar_personal_text_active");
$navbar_personal_transcripts_background: map-get($map, "navbar_personal_transcripts_background");
$navbar_personal_transcripts_background_hover: map-get($map, "navbar_personal_transcripts_background_hover");
$navbar_personal_transcripts_background_active: map-get($map, "navbar_personal_transcripts_background_active");
$navbar_personal_transcripts_text: map-get($map, "navbar_personal_transcripts_text");
$navbar_personal_transcripts_text_hover: map-get($map, "navbar_personal_transcripts_text_hover");
$navbar_personal_transcripts_text_active: map-get($map, "navbar_personal_transcripts_text_active");
$navbar_personal_cardsets_background: map-get($map, "navbar_personal_cardsets_background");
$navbar_personal_cardsets_background_hover: map-get($map, "navbar_personal_cardsets_background_hover");
$navbar_personal_cardsets_background_active: map-get($map, "navbar_personal_cardsets_background_active");
......@@ -1723,6 +1729,19 @@ $themes: (
color: $navbar_personal_text_active !important;
}
#navbar-personal-transcripts a {
background-color: $navbar_personal_transcripts_background !important;
color: $navbar_personal_transcripts_text !important;
}
#navbar-personal-transcripts a:hover, #navbar-personal-transcripts a:focus {
background-color: $navbar_personal_transcripts_background_hover !important;
color: $navbar_personal_transcripts_text_hover !important;
}
#navbar-personal-transcripts.active a, #navbar-personal-transcripts.active a:hover, #navbar-personal-transcripts.active a:focus {
background-color: $navbar_personal_transcripts_background_active !important;
color: $navbar_personal_transcripts_text_active !important;
}
#navbar-personal-cardsets a {
background-color: $navbar_personal_cardsets_background !important;
color: $navbar_personal_cardsets_text !important;
......
client/themes/theme-default.scss
View file @ 3e297482
......@@ -183,6 +183,12 @@
"navbar_personal_text": white,
"navbar_personal_text_hover": $button_text_hover,
"navbar_personal_text_active": $thm_green,
"navbar_personal_transcripts_background": $thm_gray,
"navbar_personal_transcripts_background_hover": $button_background_hover,
"navbar_personal_transcripts_background_active": $thm_green,
"navbar_personal_transcripts_text": white,
"navbar_personal_transcripts_text_hover": $button_text_hover,
"navbar_personal_transcripts_text_active": white,
"navbar_personal_cardsets_background": $thm_gray,
"navbar_personal_cardsets_background_hover": $button_background_hover,
"navbar_personal_cardsets_background_active": $thm_green,
......
imports/ui/main/navigation/top/item/personal/item/transcripts.html
View file @ 3e297482
......@@ -2,7 +2,7 @@
{{#if gotTranscriptsEnabled}}
{{#unless isSmartPhoneAndOwnsNoCards}}
{{#if canCreateContent}}
<li id="navbar-personal-cardsets"
<li id="navbar-personal-transcripts"
class="{{#if isMyTranscriptsRoute}}active{{/if}}">
<a href="{{pathFor route='transcripts'}}">
{{{getNavigationName "personalTranscripts"}}}
......
imports/ui/useCases/item/cancel.html
View file @ 3e297482
<template name="useCasesItemCancel">
<button class="btn btn-raised btn-default pull-left" type="button" data-dismiss="modal"
<button class="btn btn-raised btn-default pull-left useCasesCancel" type="button" data-dismiss="modal"
aria-hidden="true">{{_ "useCases.modal.button.cancel"}}</button>
</template>
tests/features/create-cardset/create-cardset_steps.js
View file @ 3e297482
......@@ -27,8 +27,8 @@ module.exports = function () {
});
this.Then(/^he should be able to edit the card type$/, function () {
navigation.clickElement('#setCardType');
navigation.clickElement('.cardType');
navigation.clickElement('#setCardsetFormModal .setCardTypeDropdown');
navigation.clickElement('#setCardsetFormModal .cardType');
});
this.Then(/^he should be able to edit the cardset description$/, function () {
......
tests/features/learn-cards/learn-cards_steps.js
View file @ 3e297482
......@@ -12,7 +12,7 @@ module.exports = function () {
this.Then(/^I'm at the leitner statistics to check my progress$/, function () {
navigation.selectLearnset();
navigation.selectCardsetLink(1);
navigation.selectCardsetLink(3);
cardset.collapseCardsetInfo(false);
cardset.leitnerProgress();
box1Before = navigation.getContent('#boxChart', 2, 'data-box1');
......
tests/features_helper/cardset.js
View file @ 3e297482
......@@ -18,10 +18,10 @@ module.exports = {
if (click) {
browser.click('#learnMemo');
}
browser.waitForVisible('#wozniakHelpConfirm', global.threshold);
browser.click('#wozniakHelpConfirm');
browser.waitForVisible('#startPom', global.threshold);
browser.click('#startPom');
browser.waitForVisible('#wozniakHelpConfirm', global.threshold);
browser.click('#wozniakHelpConfirm');
},
learnBox: function (click = true) {
browser.waitForVisible('.learnBtn', global.threshold);
......@@ -32,10 +32,10 @@ module.exports = {
if (click) {
browser.click('#learnBox');
}
browser.waitForVisible('#leitnerHelpConfirm', global.threshold);
browser.click('#leitnerHelpConfirm');
browser.waitForVisible('#startPom', global.threshold);
browser.click('#startPom');
browser.waitForVisible('#leitnerHelpConfirm', global.threshold);
browser.click('#leitnerHelpConfirm');
},
leitnerProgress: function (click = true) {
browser.waitForVisible('.learnBtn', global.threshold);
......
tests/features_helper/global.js
View file @ 3e297482
export const threshold = 15000;
export const thresholdText = " after 15 seconds.";
export const baseURL = "http://localhost:3000";
export const createRoute = "/create";
export const createRoute = "/personal/cardsets";
export const learnRoute = "/learn";
export const cardsetRoute = "/cardset";
export const learnBoxRoute = "/box";
export const superMemoRoute = "/memo";
export const poolRoute = "/pool";
export const poolRoute = "/public/cardsets";
tests/features_helper/navigation.js
View file @ 3e297482
......@@ -15,14 +15,6 @@ module.exports = {
browser.url(global.baseURL);
setResolution();
agreeCookies();
browser.waitForVisible('#demoConfirm', global.threshold);
browser.click("#demoConfirm");
browser.waitForVisible('.toggleFullscreen', global.threshold);
browser.click(".toggleFullscreen");
browser.waitForVisible('.swal2-confirm', global.threshold);
browser.click(".swal2-confirm");
browser.waitForVisible('#backToStartButton', global.threshold);
browser.click("#backToStartButton");
userLogin += "Login";
browser.waitForVisible('#TestingBackdoorUsername', global.threshold);
this.clickElement('#TestingBackdoorUsername', global.threshold);
......@@ -30,6 +22,8 @@ module.exports = {
this.clickElement('#' + userLogin);
browser.waitForVisible('#BackdoorLogin', global.threshold);
this.clickElement('#BackdoorLogin');
browser.waitForVisible('.useCasesCancel', global.threshold);
this.clickElement('.useCasesCancel', global.threshold);
if (browser.isVisible(".bert-alert")) {
this.clickElement(".bert-alert");
}
......@@ -39,14 +33,18 @@ module.exports = {
browser.click('.logout-main');
},
selectMyCardset: function () {
browser.waitForVisible('#cardsets', global.threshold);
browser.click('#cardsets');
browser.waitForVisible('#navbar-personal', global.threshold);
browser.click('#navbar-personal');
browser.waitForVisible('#navbar-personal-cardsets', global.threshold);
browser.click('#navbar-personal-cardsets');
this.checkUrl(global.createRoute);
},
selectLearnset: function () {
browser.waitForVisible('#learnsets', global.threshold);
browser.click('#learnsets');
browser.waitForVisible('#navbar-learn-decks', global.threshold);
browser.click('#navbar-learn-decks');
this.checkUrl(global.learnRoute);
browser.waitForVisible('#browseCardset', global.threshold);
browser.click('#browseCardset');
},
selectPool: function () {
browser.waitForVisible('#pool', global.threshold);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment