Commit 8ab847eb authored by Curtis Adam's avatar Curtis Adam

Update chimp tests

parent 563ce97c
module.exports = {
seleniumStandaloneOptions: {
version: '3.6.0',
version: '3.11.0',
drivers: {
chrome: {
version: '2.33'
version: '2.36'
},
ie: {
version: '3.6.0'
},
firefox: {
version: '0.19.0'
version: '0.20.0'
}
}
}
......
......@@ -125,7 +125,7 @@
</template>
<template name="poolTitleContent">
<a href="#" class="col-xs-12 {{#unless isActiveRoute regex="course"}}resultName{{/unless}}" data-id="{{this._id}}">
<a href="#" id="cardsetLink{{this.index}}" class="col-xs-12 {{#unless isActiveRoute regex="course"}}resultName{{/unless}}" data-id="{{this._id}}">
{{this.name}}
</a>
<span class="badge resultBadge cardsetBadge" data-id="{{this._id}}">
......
......@@ -324,7 +324,7 @@
<template name="infiniteScroll">
{{#if moreResults}}
<a href="#" title="{{_ "set-list.moreResults"}}">
<div class="showMoreResults col-xs-12 panel panel-default">
<div id="showMoreResults" class="showMoreResults col-xs-12 panel panel-default">
<span class="scrollArrow col-xs-12 infinite-scroll-icon glyphicon glyphicon-chevron-down"></span>
</div>
</a>
......
......@@ -10,7 +10,7 @@ module.exports = function () {
});
this.Given(/^User is on the my cardset view$/, function () {
navigation.selectMyCardset();
oldCardsetCount = navigation.getContent('.cardsetRow', 1);
oldCardsetCount = navigation.getContent('.resultItem', 1);
navigation.contentVisible('#newCardSet');
});
this.When(/^User clicks on a cardset that he owns$/, function () {
......@@ -36,7 +36,7 @@ module.exports = function () {
navigation.checkUrl(global.createRoute);
});
this.Then(/^he should not see the deleted cardset there$/, function () {
navigation.compareContent('.cardsetRow', --oldCardsetCount, 1);
navigation.compareContent('.resultItem', --oldCardsetCount, 1);
navigation.logout();
});
};
......@@ -31,7 +31,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list sorted by the choosen card type/, function () {
let cardsetListFilteredWord = navigation.getContent('.poolCardType', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
/**
......@@ -51,7 +51,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list sorted by the choosen author$/, function () {
let cardsetListFilteredWord = navigation.getContent('.poolAuthor', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
/**
......@@ -71,7 +71,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list sorted by the choosen college$/, function () {
let cardsetListFilteredWord = navigation.getContent('.poolCollege', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
/**
......@@ -91,7 +91,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list sorted by the choosen course$/, function () {
let cardsetListFilteredWord = navigation.getContent('.poolCourse', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
/**
......@@ -111,7 +111,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list sorted by the choosen module$/, function () {
let cardsetListFilteredWord = navigation.getContent('.poolModule', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
/**
......@@ -127,7 +127,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list filtered by the unselected free license group$/, function () {
let cardsetListFilteredWord = navigation.getContent('.pool-edu, .pool-pro', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
/**
......@@ -143,7 +143,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list filtered by the unselected edu license group$/, function () {
let cardsetListFilteredWord = navigation.getContent('.pool-free, .pool-pro', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
/**
......@@ -159,7 +159,7 @@ module.exports = function () {
this.Then(/^he should see the cardset list filtered by the unselected pro license group$/, function () {
let cardsetListFilteredWord = navigation.getContent('.pool-free, .pool-edu', 1);
navigation.compareContent('.topicName', cardsetListFilteredWord, 1);
navigation.compareContent('.resultName', cardsetListFilteredWord, 1);
});
this.Then(/^they log out$/, function () {
navigation.logout();
......
......@@ -7,11 +7,7 @@ function agreeCookies() {
}
function setResolution() {
browser.setViewportSize({
width: 1280,
height: 768
});
browser.windowHandleSize();
browser.windowHandleMaximize('current');
}
module.exports = {
......@@ -49,6 +45,9 @@ module.exports = {
},
selectCardsetLink: function (number) {
number = number - 1;
if (browser.isVisible('#showMoreResults')) {
browser.click('#showMoreResults', global.threshold);
}
browser.waitForVisible('#cardsetLink' + number, global.threshold);
browser.click('#cardsetLink' + number);
browser.waitForExist(".carousel-inner", 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