Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
cc3bd15
js and tree.py initial work on loading annotations via json
will-moore Apr 6, 2016
8e9a9c5
Rendering of tags with underscore template
will-moore Apr 6, 2016
95d0bb9
Tags display and update working for single objects
will-moore Apr 6, 2016
083620b
Basic working display of file annotations
will-moore Apr 7, 2016
251ed87
Add canDownload to fileann.permissions json
will-moore Apr 7, 2016
c8d70a7
Add OMERO constants as js variables for isOriginalMetadata()
will-moore Apr 8, 2016
d93d545
Don't show companion files under attachments
will-moore Apr 8, 2016
7dacd2b
Refresh file annotations after adding new attachment
will-moore Apr 8, 2016
55481a4
Use single setExpanded() function for all panes
will-moore Apr 8, 2016
1cd41bb
Tiny cleanup
will-moore Apr 11, 2016
86abee7
Mostly working Comments display
will-moore Apr 12, 2016
66e1dd8
Fix hardcoded urls and Comments images etc
will-moore Apr 14, 2016
1798e77
Map Annotations loaded via json
will-moore Apr 14, 2016
84d0ebf
Handle canAnnotate() for map annotations
will-moore Apr 14, 2016
a292d23
Ratings pane
will-moore Apr 15, 2016
1e6eef7
Robot test fixes & rating cleanup
will-moore Apr 15, 2016
12241cf
marshal_annotations() handles 'custom' annotations
will-moore Apr 15, 2016
1259e90
flake8 fix
will-moore Apr 16, 2016
2c3b08c
Display of 'custom' annotations
will-moore Apr 17, 2016
ff44efd
Missing customanns_underscore.html from previous commit
will-moore Apr 17, 2016
8eb6fcf
Fix tooltips on custom annotations
will-moore Apr 18, 2016
e4c6ec8
flake8 fix
will-moore Apr 18, 2016
a784d31
json data for ome.tagging_form.js moved out of annotate_tags()
will-moore Apr 18, 2016
89375b7
Fix jshint for ome.tagging_form.js
will-moore Apr 18, 2016
36db626
Split ome.general_tab.js into separate files per pane
will-moore Apr 18, 2016
dcedf57
Move Comment handling code from metadata_general.html
will-moore Apr 18, 2016
c9a5f8d
Move FileAnn handling code from metadata_general.html
will-moore Apr 18, 2016
30fcfcc
Cleanup of fileanns script checkbox toggling
will-moore Apr 19, 2016
4a154ef
Batch annotate Tags loaded by json & displayed
will-moore Apr 19, 2016
1ed08b1
Improved batch_annotate tags display
will-moore Apr 19, 2016
b29a599
Batch annotate tags update on add/remove
will-moore Apr 19, 2016
ed76cf2
Batch annotate file annotations working
will-moore Apr 19, 2016
26dc423
Remove duplicated file_ann code from batch_annotate.html
will-moore Apr 19, 2016
b83882c
Comments working in batch_annotate panel
will-moore Apr 19, 2016
5dc550e
Remove old ome.general_tab.js script
will-moore Apr 20, 2016
23dffa9
Merge remote-tracking branch 'origin/develop' into right_panel_annota…
will-moore Apr 20, 2016
047e173
Fix Robot tests for right panel
will-moore Apr 20, 2016
905c850
Fixing more Robot batch annotate tests
will-moore Apr 20, 2016
2a80c9b
Fix display of Tables data for Well
will-moore Apr 20, 2016
5b5f661
Rating working on batch_annotation panel
will-moore Apr 21, 2016
3b956e7
Move ratings jQuery code to RatingsPane to avoid duplication
will-moore Apr 21, 2016
91f06e4
Only allow rating update if canAnnotate
will-moore Apr 21, 2016
10ab955
Use '-' icon for Remove Tag
will-moore Apr 22, 2016
57956e5
Use longer dash '-' for Attachment remove button
will-moore Apr 22, 2016
fa19bc1
Fix wrapping of long keys/values in bulk annotation tables
will-moore Apr 22, 2016
be8b5e1
Fixing Robot tests for Tagging and Batch annotate
will-moore Apr 22, 2016
e36bd8f
Ratings pane below Attachments in batch_annotate panel
will-moore Apr 22, 2016
3235d2f
Add 'Others' pane to batch_annotate panel
will-moore Apr 22, 2016
3d61e32
Fix 'Added by' filter for all annotations
will-moore Apr 25, 2016
2608d9d
Fix expanding/collapse of Details panes
will-moore Apr 25, 2016
d6f010a
Fix rendering of Comment avatar image
will-moore Apr 25, 2016
4d158ca
Fix switching of Field when Plate selected
will-moore Apr 25, 2016
3ccd9e6
Fix unloaded experimenter if not member of default group
will-moore Apr 25, 2016
2fd32e8
Script fileAnn checkbox works, even for read-only data
will-moore Apr 25, 2016
27ccbdb
Fixing tooltips as suggested in PR #4579
will-moore Apr 25, 2016
ca2facc
Remove Comment for all objects in batch_annotate panel
will-moore Apr 25, 2016
e28e0ed
Update 'Select files for scripts' tooltip in Robot test
will-moore Apr 26, 2016
1f247b9
Fix batch annotation of Wells (annotating images)
will-moore Apr 26, 2016
569052d
Remove page refreshes from Robot tagging_test.txt
will-moore Apr 26, 2016
a6adb95
New Robot annotate_test.txt tests Comments
will-moore Apr 26, 2016
b1aefa0
Fix '+' button for Map Annotations
will-moore Apr 26, 2016
0a89711
Fix display of new Comment after deleting all old ones
will-moore Apr 26, 2016
b8e0b3a
Correctly format date in annotation tab underscore templates
will-moore Apr 27, 2016
10599fb
Move OME.removeItem() calls to right_panel*.js and cleanup
will-moore Apr 27, 2016
53a08b6
Remove unused canAnnotate and index from annPaneData
will-moore Apr 27, 2016
dcbea37
Move tagging jQuery code to right_panel_tags_pane
will-moore Apr 27, 2016
3812d9f
Custom annotations show 'Linked to' in tooltip for batch annotation p…
will-moore Apr 27, 2016
9422067
Initial draft of 5.2.3 version history
Apr 27, 2016
494c0aa
Add keepalive for root connection
Apr 28, 2016
34b85e4
Started adding Robot Test File Annotations
will-moore Apr 28, 2016
0a9e0c8
Fix Robot test with updated tooltip 'Insert row'
will-moore Apr 28, 2016
18d66dd
MIF and specific ice version
Apr 28, 2016
c0a031a
Comment form doesn't use form_comment hidden fields for objects
will-moore Apr 28, 2016
6b77639
Move WEBCLIENT global vars up to base_container.html for search.html etc
will-moore Apr 28, 2016
14b37bc
Replace connect with createSession
Apr 28, 2016
804f240
Delete Comment only after removal from all parents
will-moore Apr 28, 2016
58bfebb
get better message for status when using apache
atarkowska Apr 28, 2016
0ba368b
Ratings 'remove' button and tooltip use canAnnotate permissions
will-moore Apr 28, 2016
aa13041
Remove mention of dependencies testing
Apr 28, 2016
30d4c1e
Merge remote-tracking branch 'origin/develop' into right_panel_annota…
will-moore Apr 28, 2016
3668466
Missing WEBCLIENT.initially_select from previous merge commit
will-moore Apr 28, 2016
2ce2860
Added first integration test for marshal_annotations
will-moore Apr 28, 2016
34f592d
Add 'test_single_annotate_userB'
will-moore Apr 28, 2016
1eeae88
fix error and add to startup
atarkowska Apr 29, 2016
6f8e1bb
Add integration test with 2 users adding same tag
will-moore Apr 29, 2016
fc7aa3f
Remove hide_if_empty() for filesAnns and shares
will-moore Apr 29, 2016
61a7965
Use group -1 in manage_action_containers()
will-moore Apr 29, 2016
18f290c
Revert "Use group -1 in manage_action_containers()"
will-moore Apr 29, 2016
93aa9e6
Small improvement to integration test annotations
will-moore Apr 29, 2016
35501db
Another integration test of 2 projects with tags
will-moore Apr 29, 2016
1333c51
Add integration test of tags AND comments on project
will-moore Apr 29, 2016
dfe9b99
cleanup message and fix test
atarkowska Apr 29, 2016
f802bfb
Adding more tests for annotate_test
May 1, 2016
10845e0
Uncomment suite teardown
May 1, 2016
3748675
Merge pull request #53 from bramalingam/right_panel_annotation_tabs
May 1, 2016
c83236e
Robot test waits for search result before clicking
will-moore May 1, 2016
6021441
Merge pull request #4618 from aleksandra-tarkowska/apache_status
jburel May 2, 2016
884f5de
Merge pull request #4617 from ximenesuk/test-root-keepalive
jburel May 2, 2016
c2a0c94
Improve list assertions in annotations integrations tests
will-moore May 2, 2016
d9d3f5d
Update Robot map_annotation_test: '+' btn disabled initially
will-moore May 2, 2016
2669c9a
fix robot search test variable name
will-moore May 2, 2016
e9618de
Possible improvement to Robot Test Batch Annotate in forms_test.txt
will-moore May 2, 2016
13ce150
Clean up newly created P/D/S post tests to maintain database state
May 2, 2016
62fd97e
Add web fixes & expand sysadmin section
May 2, 2016
e4ecb25
Typo fix canDonwload() -> canDownload()
will-moore May 2, 2016
6735da6
Merge pull request #54 from bramalingam/right_panel_annotation_tabs
May 2, 2016
b37516d
Add web config improvements
May 2, 2016
57ffa62
Workaround 'Add Comment' button visibility
will-moore May 2, 2016
44642c4
Merge pull request #4579 from will-moore/right_panel_annotation_tabs
jburel May 3, 2016
3bcced1
Merge pull request #4615 from hflynn/5-2-3
jburel May 3, 2016
d0355b7
Merge tag 'v5.2.3' into 5.2.3_final_merge
sbesson May 6, 2016
8134023
Remove the client-side deletion of orphaned comments
sbesson May 6, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions components/tests/python/library/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,20 @@ def teardown_class(cls):
cls.root = None
cls.__clients.__del__()

def keepRootAlive(self):
"""
Keeps root connection alive.
"""
try:
if self.root.sf is None:
p = Ice.createProperties(sys.argv)
rootpass = p.getProperty("omero.rootpass")
self.root.createSession("root", rootpass)
else:
self.root.sf.keepAlive(None)
except Exception:
raise

@classmethod
def omeropydir(self):
count = 10
Expand Down
10 changes: 5 additions & 5 deletions components/tests/ui/resources/web/tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,11 @@ Wait Until Right Panel Loads Everything

Wait Until Right Panel Loads ${containerType} ${containerId}
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/h1[contains(text(),'${containerType} Details')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/h1[contains(text(),'Tags')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/h1[contains(text(),'Key-Value Pairs')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/h1[contains(text(),'Attachments')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/h1[contains(text(),'Ratings')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/h1[contains(text(),'Comments')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/div/h1[contains(text(),'Tags')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/div/h1[contains(text(),'Key-Value Pairs')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/div/h1[contains(text(),'Attachments')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/div/h1[contains(text(),'Ratings')]
Wait Until Element Is Visible xpath=//*[@id="general_tab"]/div/h1[contains(text(),'Comments')]
Run Keyword If '${containerType}' == 'Project' Wait Until Element Is Visible ${detailsPane}//th[contains(text(),'Creation Date:')]
Run Keyword If '${containerType}' == 'Dataset' Wait Until Element Is Visible ${detailsPane}//th[contains(text(),'Creation Date:')]
Run Keyword If '${containerType}' == 'Image' Check Right Panel Image
Expand Down
9 changes: 9 additions & 0 deletions components/tests/ui/robot_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ TINY_IMAGE_NAME=${TINY_IMAGE_NAME:-test&acquisitionDate=2012-01-01_00-00-00.fake
MIF_IMAGE_NAME=${MIF_IMAGE_NAME:-test&series=3.fake}
PLATE_NAME=${PLATE_NAME:-test&plates=1&plateAcqs=1&plateRows=2&plateCols=3&fields=1&screens=0.fake}
BULK_ANNOTATION_CSV=${BULK_ANNOTATION_CSV:-bulk_annotation.csv}
FILE_ANNOTATION=${FILE_ANNOTATION:-robot_file_annotation.txt}

# Create robot user and group
bin/omero login root@$HOSTNAME:$PORT -w $ROOT_PASSWORD
Expand All @@ -41,6 +42,9 @@ echo "Well,Well Type,Concentration" > "$BULK_ANNOTATION_CSV"
echo "A1,Control,0" >> "$BULK_ANNOTATION_CSV"
echo "A2,Treatment,10" >> "$BULK_ANNOTATION_CSV"

# Create file for upload as File Annotation
echo "Robot test file annotations" > "$FILE_ANNOTATION"

# Create robot setup
bin/omero login $USER_NAME@$HOSTNAME:$PORT -w $USER_PASSWORD
# Parse the sessions file to get session key
Expand Down Expand Up @@ -113,6 +117,11 @@ do
bin/omero import $TINY_IMAGE_NAME --debug ERROR
done

# Uplodad file and create FileAnnotation
bin/omero upload $FILE_ANNOTATION > file_upload.log
fileId=$(sed "s/^Uploaded $FILE_ANNOTATION as //" file_upload.log)
bin/omero obj new FileAnnotation file=OriginalFile:$fileId

# Logout
bin/omero logout

Expand Down
221 changes: 221 additions & 0 deletions components/tests/ui/testcases/web/annotate_test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
*** Settings ***
Documentation Tests submission of forms.

Resource ../../resources/config.txt
Resource ../../resources/web/login.txt
Resource ../../resources/web/tree.txt

Suite Setup Run Keywords User "${USERNAME}" logs in with password "${PASSWORD}" Maximize Browser Window
Suite Teardown Close all browsers

*** Variables ***
${commentText} Robot test adding this comment
${commentTextTwo} A second comment added by Robot test
${commentTextThree} This will be added to Two Datasets
${commentTextFour} I (Robot) just love adding comments!
${fileName} robot_file_annotation.txt
${fileNameTwo} bulk_annotations
${SEARCH URL} ${WELCOME URL}search/


*** Keywords ***

Check For Comment
[Arguments] ${text}
Wait Until Page Contains Element xpath=//div[@class='commentText'][contains(text(), '${text}')]

Check Comment Gone
[Arguments] ${text}
Page Should Not Contain Element xpath=//div[@class='commentText'][contains(text(), '${text}')]

Add Comment
[Arguments] ${text}
Wait Until Element Is Visible id=id_comment
Input Text comment ${text}
Submit Form add_comment_form
Check For Comment ${text}

Remove Comment
[Arguments] ${text}
Click Element xpath=//div[contains(@class, 'ann_comment_text')][descendant::div[contains(text(), '${text}')]]/img[@class='removeComment']
Click Dialog Button OK
Wait Until Keyword Succeeds ${TIMEOUT} ${INTERVAL} Check Comment Gone ${text}


Add File Annotation
[Arguments] ${fileAnnotationName}
Wait Until Element Is Visible id=choose_file_anns
Click Element id=choose_file_anns
Wait Until Page Contains Element id=id_files
# Click Element xpath=//select[@id='id_files']/option[contains(text(), ${fileName})]
Select From List By Label id=id_files ${fileAnnotationName}
Click Dialog Button Accept
Check For File Annotation ${fileAnnotationName}

Check For File Annotation
[Arguments] ${fileAnnotationName}
Wait Until Element Is Visible xpath=//li[contains(@class, 'file_ann_wrapper')][descendant::a[contains(text(), '${fileAnnotationName}')]]//*[@class='removeFile action']
Wait Until Element Is Visible xpath=//li[contains(@class, 'file_ann_wrapper')][descendant::a[contains(text(), '${fileAnnotationName}')]]//a[@class='deleteFile action']
Wait Until Element Is Visible xpath=//ul[@id="fileanns_container"]//a[contains(text(), '${fileAnnotationName}')]
Wait Until Element Is Visible xpath=//li[contains(@class, 'file_ann_wrapper')][descendant::a[contains(text(), '${fileAnnotationName}')]]//span
# Mouse Over //ul[@id="fileanns_container"]//a[contains(@class, 'tooltip')]
# Wait Until Element Is Visible //ul[@id="fileanns_container"]//a[contains(@class, 'tooltip')][contains(@aria-describedby, 'ui-tooltip')]

Remove File Annotation
[Arguments] ${fileAnnotationName}

Wait Until Element Is Visible xpath=//li[contains(@class, 'file_ann_wrapper')][descendant::a[contains(text(), '${fileAnnotationName}')]]//*[@class='removeFile action']
Click Element xpath=//li[contains(@class, 'file_ann_wrapper')][descendant::*[contains(text(), '${fileAnnotationName}')]]//*[@class='removeFile action']

Click Dialog Button OK
Wait Until Keyword Succeeds ${TIMEOUT} ${INTERVAL} Check File Annotation Gone ${fileAnnotationName}

Check File Annotation Gone
[Arguments] ${fileAnnotationName}
Page Should Not Contain Element xpath=//ul[@id="fileanns_container"]//a[contains(text(), '${fileAnnotationName}')]


*** Test Cases ***

Test Comments

Select Experimenter
${dsId_One}= Create Dataset robot test comments_1
${dsId_Two}= Create Dataset robot test comments_2

# Comment a single Dataset
Click Element xpath=//h1[@data-name='comments']
Add Comment ${commentText}

# Refresh (select other Dataset and re-select)
${nodeId}= Select Dataset By Id ${dsId_One}
Wait Until Right Panel Loads Dataset ${dsId_One}
Select Dataset By Id ${dsId_Two}
# Check and add another Comment
Check For Comment ${commentText}
Add Comment ${commentTextTwo}
# Remove first comment
Remove Comment ${commentText}

# Now select both Datasets...
Meta Click Node ${nodeId}
Wait Until Page Contains Element id=batch_ann_title
# Previously added Comment will show up
Check For Comment ${commentTextTwo}
Page Should Not Contain Element xpath=//div[@class='commentText'][contains(text(), '${commentText}')]
# Add Comments to Both Datasets
Add Comment ${commentTextThree}
Add Comment ${commentTextFour}

# Select each single Dataset to check for Comment(s)
Select Dataset By Id ${dsId_One}
Check Comment Gone ${commentTextTwo}
Check For Comment ${commentTextThree}
Select Dataset By Id ${dsId_Two}
Check For Comment ${commentTextTwo}
Check For Comment ${commentTextThree}

# Select both Datasets and Remove Comments
Meta Click Node ${nodeId}
Wait Until Page Contains Element id=batch_ann_title
Remove Comment ${commentTextTwo}
Remove Comment ${commentTextThree}

# Select each single Dataset again to check for Comment(s)
Select Dataset By Id ${dsId_One}
Check For Comment ${commentTextFour}
Check Comment Gone ${commentTextTwo}
Check Comment Gone ${commentTextThree}
Select Dataset By Id ${dsId_Two}
Check For Comment ${commentTextFour}
Check Comment Gone ${commentTextTwo}
Check Comment Gone ${commentTextThree}

Select Dataset By Id ${dsId_One}
Delete Container

Select Dataset By Id ${dsId_Two}
Delete Container


Test File Annotations

Select Experimenter
${sId_One}= Create Screen robot file annotations_1
${sId_Two}= Create Screen robot file annotations_2

# Annotate single Screen
Click Element xpath=//h1[@data-name='attachments']
Add File Annotation ${fileName}

# Refresh (select other Screen and re-select)
${nodeId}= Select Screen By Id ${sId_One}
Wait Until Right Panel Loads Screen ${sId_One}
Select Screen By Id ${sId_Two}
# Check and add another File Annotation
Check For File Annotation ${fileName}
Add File Annotation ${fileNameTwo}
# Remove first File Annotation
Remove File Annotation ${fileName}

# Now select both Screens...
Meta Click Node ${nodeId}
Wait Until Page Contains Element id=batch_ann_title
# Previously added File Annotation will show up
Check For File Annotation ${fileNameTwo}
Check File Annotation Gone ${fileName}
# Add File Annotation to Both Screens
Add File Annotation ${fileName}
Select Screen By Id ${sId_One}
Check For File Annotation ${fileName}
Select Screen By Id ${sId_Two}
Check For File Annotation ${fileName}

# Now select both Screens...
Meta Click Node ${nodeId}
Wait Until Page Contains Element id=batch_ann_title
# Remove first File Annotation
Remove File Annotation ${fileName}
Select Screen By Id ${sId_One}
Check File Annotation Gone ${fileName}
Select Screen By Id ${sId_Two}
Check File Annotation Gone ${fileName}

Delete Container
Select Screen By Id ${sId_One}
Delete Container

# Test Rating

Test Search Results File Annotations

Select Experimenter
${sId_One}= Create Screen robot file annotations_1

# Annotate single Screen
Add File Annotation ${fileNameTwo}

Input Text id=id_search_query ${fileNameTwo}
Submit Form
Location Should Be ${SEARCH URL}

Wait Until Page Contains Element xpath=//img[contains(@alt, 'plate')]
Click Element xpath=//img[contains(@alt, 'plate')]
Wait Until Page Contains Element //*[@id="general_tab"]//th[contains(text(), 'Plate ID:')]

#Minimal checking to check if you can add Annotations on the search result page
Click Element xpath=//h1[@data-name='attachments']
Check For File Annotation ${fileNameTwo}
Remove File Annotation ${fileNameTwo}
Add File Annotation ${fileNameTwo}
Click Element xpath=//h1[@data-name='comments']
Add Comment ${commentText}

Go To ${WELCOME URL}
Select Experimenter
Select Screen By Id ${sId_One}
Delete Container




19 changes: 11 additions & 8 deletions components/tests/ui/testcases/web/center_right_panel_tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,25 @@ Wait Until Right Panel Loads For MultiSelection
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/button[contains(@title, 'Download Image as...')]
Wait Until Element Is Visible xpath=//*[@id="show_link_btn"]/span

Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h2[contains(text(), 'Annotations')]
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Attachments')]
Wait Until Element Is Visible xpath=//*[@id="annotationFilter"]

Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h2[contains(text(), 'Rating')]
Wait Until Element Is Visible xpath=//*[@id="add_rating"]/span
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Ratings')]
Click Element xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Ratings')]
Wait Until Element Is Visible xpath=//*[@id="rating_annotations"]

Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h2[contains(text(), 'Tags')]
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Tags')]
Click Element xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Tags')]
Wait Until Element Is Visible xpath=//*[@id="launch_tags_form"]/span

Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h2[contains(text(), 'Attach')]
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/input[contains(@title, 'Select Files for Scripts')]
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Attachments')]
Click Element xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Attachments')]
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/input[contains(@title, 'Select files for scripts')]
Wait Until Element Is Visible xpath=//*[@id="choose_file_anns"]/span

Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h2[contains(text(), 'Comment')]
Wait Until Element Is Visible xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Comments')]
Click Element xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Comments')]
Wait Until Element Is Visible xpath=//*[@id="id_comment"]
Wait Until Element Is Visible xpath=//*[@id="add_comment_form"]//td/input[contains(@value, 'Add Comment')]

Element Should Not Be Visible xpath=//*[@id="general_tab"]

Expand Down
8 changes: 7 additions & 1 deletion components/tests/ui/testcases/web/forms_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,15 @@ Test Batch Annotate
Wait Until Page Contains Element id=batch_ann_title

# Comment Form
Click Element xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Comments')]
Wait Until Element Is Visible id=id_comment
Input Text comment test add comment
Click Button Add Comment
Submit Form add_comment_form
Wait Until Page Contains test add comment

# Tags
Click Element xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Tags')]
Wait Until Element Is Visible id=launch_tags_form
Click Element launch_tags_form
Wait Until Page Contains Element id_tag
# Wait for tag panel being loded
Expand All @@ -160,6 +164,8 @@ Test Batch Annotate
Wait Until Page Contains Element xpath=//div[@class='tag']/a[contains(text(), testSeleniumTag${pid})] ${WAIT}

# Files
Click Element xpath=//*[@id="metadata_general"]//div/h1[contains(text(), 'Attachments')]
Wait Until Element Is Visible id=choose_file_anns
Click Element choose_file_anns
Wait Until Page Contains Element id_files
Click Element xpath=//select[@id='id_files']/option # just pick first file
Expand Down
2 changes: 1 addition & 1 deletion components/tests/ui/testcases/web/map_annotations_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Test Map Annotation
Wait Until Page Contains Element css=div.mapAnnContainer
Click Element xpath=//h1[@data-name='keyvaluepairs']
# No rows selected. Toolbar should allow 'Insert' only.
Xpath Should Not Have Class xpath=//ul[contains(@class, 'mapAnnToolbar')]//input[@title='Insert rows'] button-disabled
Xpath Should Have Class xpath=//ul[contains(@class, 'mapAnnToolbar')]//input[@title='Insert row'] button-disabled
Xpath Should Have Class xpath=//ul[contains(@class, 'mapAnnToolbar')]//input[@title='Copy rows'] button-disabled
Xpath Should Have Class xpath=//ul[contains(@class, 'mapAnnToolbar')]//input[@title='Paste rows'] button-disabled
Xpath Should Have Class xpath=//ul[contains(@class, 'mapAnnToolbar')]//input[@title='Delete rows'] button-disabled
Expand Down
Loading