Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
70b1754a
Commit
70b1754a
authored
7 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-2635: fix selenium tests
parent
c2e42276
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/commons/memberlist/ui/_content/members.html
+5
-5
5 additions, 5 deletions
...java/org/olat/commons/memberlist/ui/_content/members.html
src/test/java/org/olat/selenium/page/group/GroupPage.java
+8
-8
8 additions, 8 deletions
src/test/java/org/olat/selenium/page/group/GroupPage.java
with
13 additions
and
13 deletions
src/main/java/org/olat/commons/memberlist/ui/_content/members.html
+
5
−
5
View file @
70b1754a
...
...
@@ -10,21 +10,21 @@
#end
</div>
<div
class=
"o_cmembers
o_owners
"
>
<div
class=
"o_cmembers"
>
#if($showOwners
&&
$hasOwners)
<div
class=
"clearfix"
>
<div
class=
"clearfix
o_owners o_sel_owners
"
>
<h4>
$r.translate("members.owners")
</h4>
$r.render("owners")
</div>
#end
#if($showCoaches
&&
$hasCoaches)
<div
class=
"clearfix o_block o_coaches"
>
<div
class=
"clearfix o_block o_coaches
o_sel_coaches
"
>
<h4>
$r.translate("members.coaches")
</h4>
$r.render("coaches")
</div>
#end
#if($showParticipants)
<div
class=
"clearfix o_block o_participants"
>
<div
class=
"clearfix o_block o_participants
o_sel_participants
"
>
<h4>
$r.translate("members.participants")
</h4>
#if($hasParticipants)
$r.render("participants")
...
...
@@ -34,7 +34,7 @@
</div>
#end
#if($showWaiting
&&
$hasWaiting)
<div
class=
"clearfix o_block o_participants"
>
<div
class=
"clearfix o_block o_participants
o_sel_waiting_list
"
>
<h4>
$r.translate("members.waiting")
</h4>
$r.render("waiting")
</div>
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/olat/selenium/page/group/GroupPage.java
+
8
−
8
View file @
70b1754a
...
...
@@ -326,22 +326,22 @@ public class GroupPage {
}
public
GroupPage
assertParticipantList
()
{
By
participantListBy
=
By
.
id
(
"o_sel_
group_
participants"
);
By
participantListBy
=
By
.
className
(
"o_sel_participants"
);
List
<
WebElement
>
participantListEl
=
browser
.
findElements
(
participantListBy
);
Assert
.
assertFalse
(
participantListEl
.
isEmpty
());
return
this
;
}
public
GroupPage
assertMembersInOwnerList
(
UserVO
owner
)
{
return
assertMembers
(
owner
,
"o_sel_
group_
coaches"
);
return
assertMembers
(
owner
,
"o_sel_coaches"
);
}
public
GroupPage
assertMembersInParticipantList
(
UserVO
owner
)
{
return
assertMembers
(
owner
,
"o_sel_
group_
participants"
);
return
assertMembers
(
owner
,
"o_sel_participants"
);
}
public
GroupPage
assertMembersInWaitingList
(
UserVO
owner
)
{
return
assertMembers
(
owner
,
"o_sel_
group_
waiting_list"
);
return
assertMembers
(
owner
,
"o_sel_waiting_list"
);
}
private
GroupPage
assertMembers
(
UserVO
member
,
String
cssClass
)
{
...
...
@@ -351,20 +351,20 @@ public class GroupPage {
}
public
boolean
isInMembersOwnerList
(
UserVO
owner
)
{
return
isMembers
(
owner
,
"o_sel_
group_
coaches"
);
return
isMembers
(
owner
,
"o_sel_coaches"
);
}
public
boolean
isInMembersParticipantList
(
UserVO
owner
)
{
return
isMembers
(
owner
,
"o_sel_
group_
participants"
);
return
isMembers
(
owner
,
"o_sel_participants"
);
}
public
boolean
isInMembersInWaitingList
(
UserVO
owner
)
{
return
isMembers
(
owner
,
"o_sel_
group_
waiting_list"
);
return
isMembers
(
owner
,
"o_sel_waiting_list"
);
}
private
boolean
isMembers
(
UserVO
member
,
String
cssClass
)
{
String
firstName
=
member
.
getFirstName
();
By
longBy
=
By
.
xpath
(
"//div[
@id=
'"
+
cssClass
+
"']//
table//tr//td//a
[contains(text(),'"
+
firstName
+
"')]"
);
By
longBy
=
By
.
xpath
(
"//div[
contains(@class,
'"
+
cssClass
+
"'
)
]//
div[contains(@class,'o_cmember_info_wrapper')]/a/span
[contains(text(),'"
+
firstName
+
"')]"
);
List
<
WebElement
>
elements
=
browser
.
findElements
(
longBy
);
return
elements
.
size
()
>
0
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment