Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
899
Issues
899
List
Boards
Labels
Service Desk
Milestones
Merge Requests
45
Merge Requests
45
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
72634421
Commit
72634421
authored
27 minutes ago
by
Ben Hayward
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated to use data attributes
parent
ede58a87
feat/messenger-e2e-1826
1 merge request
!542
[Sprint/ModestMonkey](feat): Messenger e2e #1826
Pipeline
#81402030
running with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
messenger.spec.js
cypress/integration/messenger.spec.js
+5
-5
conversation.component.html
...odules/messenger/conversation/conversation.component.html
+11
-3
No files found.
cypress/integration/messenger.spec.js
View file @
72634421
...
...
@@ -18,13 +18,13 @@ context('Messenger', () => {
const
passwordInput
=
(
i
)
=>
`input[type=password]:nth-child(
${
i
}
)`
;
const
submitPassword
=
'
m-messenger--encryption > div > button
'
;
const
messageInput
=
'
.m-messenger--conversation-composer > textarea
'
;
const
sendButton
=
'
.m-messenger--conversation-composer > i:nth-child(3)
'
;
const
sendButton
=
'
[data-cy=send]
'
;
const
messageBubble
=
'
.m-messenger--conversation-message-bubble
'
;
const
settingsButton
=
'
.m-messenger--dockpane-tab-actions > i:nth-child(2)
'
;
const
closeButton
=
'
.m-messenger--dockpane-tab-actions > i:nth-child(3)
'
;
const
settingsButton
=
'
[data-cy=options]
'
;
const
closeButton
=
'
[data-cy=close]
'
;
const
destroyButton
=
'
.m-messenger--dockpane-tab-ribbon > div:nth-child(1) > i
'
;
const
destroyButton
=
'
[data-cy=destroy]
'
;
before
(()
=>
{
cy
.
newUser
(
testUsername
,
testPassword
);
...
...
@@ -34,8 +34,8 @@ context('Messenger', () => {
cy
.
preserveCookies
();
cy
.
server
();
cy
.
route
(
'
GET
'
,
'
**/api/v2/messenger/search?*
'
).
as
(
'
search
'
);
cy
.
route
(
'
POST
'
,
'
**/api/v2/messenger/conversations/**
'
).
as
(
'
send
'
);
cy
.
route
(
'
GET
'
,
'
**/api/v2/messenger/conversations/**
'
).
as
(
'
conversations
'
);
cy
.
route
(
'
POST
'
,
'
**/api/v2/messenger/conversations/**
'
).
as
(
'
send
'
);
cy
.
route
(
'
POST
'
,
'
**/api/v2/messenger/keys/setup**
'
).
as
(
'
keys
'
)
cy
.
get
(
openMessenger
)
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/messenger/conversation/conversation.component.html
View file @
72634421
...
...
@@ -19,8 +19,13 @@
<i
class=
"material-icons mdl-color-text--blue-grey-100"
[hidden]=
"live"
>
sync_problem
</i
>
<i
class=
"material-icons"
(click)=
"ribbonToggle()"
>
more_vert
</i>
<i
class=
"material-icons"
(click)=
"dockpanes.close(conversation)"
<i
class=
"material-icons"
(click)=
"ribbonToggle()"
data-cy=
"options"
>
more_vert
</i
>
<i
class=
"material-icons"
(click)=
"dockpanes.close(conversation)"
data-cy=
"close"
>
close
</i
>
</div>
...
...
@@ -42,7 +47,9 @@
i18n-title=
"@@MESSENGER__CONVERSATION__DELETE_TOOLTIP"
>
delete
</i
>
<ng-container
i18n=
"@@MESSENGER__CONVERSATION__DESTROY"
<ng-container
i18n=
"@@MESSENGER__CONVERSATION__DESTROY"
data-cy=
"destroy"
>
Destroy
</ng-container
>
</div>
...
...
@@ -244,6 +251,7 @@
<i
class=
"material-icons mdl-color-text--blue-grey-600"
(click)=
"send($event); emoji.close()"
data-cy=
"send"
>
send_arrow
</i
>
<minds-emoji
[localDirective]=
"emoji"
></minds-emoji>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment