Update Dependency Versions

Fixes gh-386
This commit is contained in:
Rob Winch
2016-02-24 10:03:52 -06:00
parent 8e4ed22974
commit 11ca552625
11 changed files with 80 additions and 24 deletions

View File

@@ -28,6 +28,10 @@ import pages.*
*/
@Stepwise
class UserTests extends GebReportingSpec {
def setup() {
browser.driver.javascriptEnabled = true
}
def 'first visit not authenticated'() {
when:
to HomePage

View File

@@ -29,9 +29,25 @@ class HomePage extends Page {
navLink { $('#navLink') }
error { $('#error').text() }
form { $('form') }
username(required:false) { $('#un').text() }
logout(required:false) { $('#logout') }
addAccount(required:false) { $('#addAccount') }
username(required:false) {
$('#un').text()
}
userMenu() {
if(!$('#user-menu').displayed) {
$('#toggle').jquery.click()
}
waitFor {
$('#user-menu').displayed
}
}
logout(required:false) {
userMenu()
$('#logout')
}
addAccount(required:false) {
userMenu()
$('#addAccount')
}
submit { $('input[type=submit]') }
login(required:false) { user, pass ->
form.username = user
@@ -39,6 +55,7 @@ class HomePage extends Page {
submit.click(HomePage)
}
switchAccount{ un ->
userMenu()
$("#switchAccount${un}").click(HomePage)
}
attributes { moduleList AttributeRow, $("table tr").tail() }

View File

@@ -28,7 +28,16 @@ class LinkPage extends Page {
static content = {
form { $('#navLinks') }
username(required:false) { $('#un').text() }
userMenu() {
if(!$('#user-menu').displayed) {
$('#toggle').jquery.click()
}
waitFor {
$('#user-menu').displayed
}
}
switchAccount{ un ->
userMenu()
$("#switchAccount${un}").click(HomePage)
}
}

View File

@@ -34,8 +34,8 @@
<c:if test="${currentAccount != null or not empty accounts}">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><c:out value="${username}"/> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<a id="toggle" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><c:out value="${username}"/> <span class="caret"></span></a>
<ul id="user-menu" class="dropdown-menu" role="menu">
<c:if test="${currentAccount != null}">
<li><a id="logout" href="${currentAccount.logoutUrl}">Log Out</a></li>
<li><a id="addAccount" href="${addAccountUrl}">Add Account</a></li>

View File

@@ -29,8 +29,8 @@
<c:if test="${currentAccount != null or not empty accounts}">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><c:out value="${username}"/> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<a id="toggle" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><c:out value="${username}"/> <span class="caret"></span></a>
<ul id="user-menu" class="dropdown-menu" role="menu">
<c:if test="${currentAccount != null}">
<li><a id="logout" href="${currentAccount.logoutUrl}">Log Out</a></li>
<li><a id="addAccount" href="${addAccountUrl}">Add Account</a></li>