diff options
| -rw-r--r-- | robot/resources/portal-sdk/portalDef.robot | 23 | ||||
| -rw-r--r-- | robot/testsuites/portalApp.robot | 74 |
2 files changed, 41 insertions, 56 deletions
diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot index 8be3abdc..cf553e4c 100644 --- a/robot/resources/portal-sdk/portalDef.robot +++ b/robot/resources/portal-sdk/portalDef.robot @@ -13,6 +13,7 @@ Library String #Library XvfbRobot Resource ../json_templater.robot +Resource ../browser_setup.robot *** Variables *** #${PORTAL_URL} http://portal.api.simpledemo.onap.org:8989 @@ -60,30 +61,14 @@ ${download_link_id} 0 *** Keywords *** -Setup Browser - [Documentation] Sets up browser based upon the value of ${GLOBAL_SELENIUM_BROWSER} - #Run Keyword If '${GLOBAL_SELENIUM_BROWSER}' == 'firefox' Setup Browser Firefox - Run Keyword If '${GLOBAL_SELENIUM_BROWSER}' == 'chrome' Setup Browser Chrome - Log Running with ${GLOBAL_SELENIUM_BROWSER} - -Setup Browser Chrome - ${os}= Get Normalized Os - Log Normalized OS=${os} - ${chrome options}= Evaluate sys.modules['selenium.webdriver'].ChromeOptions() sys - Call Method ${chrome options} add_argument no-sandbox - ${dc} Evaluate sys.modules['selenium.webdriver'].DesiredCapabilities.CHROME sys, selenium.webdriver - Set To Dictionary ${dc} elementScrollBehavior 1 - Create Webdriver Chrome chrome_options=${chrome_options} desired_capabilities=${dc} - Set Global Variable ${GLOBAL_SELENIUM_BROWSER_CAPABILITIES} ${dc} - Portal admin Login To Portal GUI [Documentation] Logs into Portal GUI ## Setup Browser Now being managed by test case Setup Browser #Start Virtual Display 1920 1080 - Open Browser ${PORTAL_LOGIN_URL} chrome - #Go To ${PORTAL_LOGIN_URL} - Maximize Browser Window + #Open Browser ${PORTAL_LOGIN_URL} chrome + Go To ${PORTAL_LOGIN_URL} + #Maximize Browser Window Set Selenium Speed ${GLOBAL_SELENIUM_DELAY} Set Browser Implicit Wait ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} Log Logging in to ${PORTAL_URL}${PORTAL_ENV} diff --git a/robot/testsuites/portalApp.robot b/robot/testsuites/portalApp.robot index 51c9fa35..17844f26 100644 --- a/robot/testsuites/portalApp.robot +++ b/robot/testsuites/portalApp.robot @@ -9,19 +9,19 @@ Login into Portal URL [TAGS] portal Portal admin Login To Portal GUI -Portal Change REST URL Of X-DemoApp - [TAGS] portal - [Documentation] Portal Change REST URL Of X-DemoApp - Portal Change REST URL +#Portal Change REST URL Of X-DemoApp +# [TAGS] portal +# [Documentation] Portal Change REST URL Of X-DemoApp +# Portal Change REST URL -Portal R1 Release for AAF - [TAGS] portal - [Documentation] ONAP Portal R1 functionality for AAF test - Portal AAF new fields +#Portal R1 Release for AAF +# [TAGS] portal +# [Documentation] ONAP Portal R1 functionality for AAF test +# Portal AAF new fields -Create Microse service onboarding - [TAGS] portal - Portal admin Microservice Onboarding +#Create Microse service onboarding +# [TAGS] portal +# Portal admin Microservice Onboarding EP Admin widget layout reset [TAGS] portal @@ -39,15 +39,15 @@ Edit Functional Menu [TAGS] portal Portal admin Edit Functional menu -Broadbond Notification functionality - [TAGS] portal - ${AdminBroadCastMsg}= Portal Admin Broadcast Notifications - set global variable ${AdminBroadCastMsg} +#Broadbond Notification functionality +# [TAGS] portal +# ${AdminBroadCastMsg}= Portal Admin Broadcast Notifications +# set global variable ${AdminBroadCastMsg} -Category Notification functionality - [TAGS] portal - ${AdminCategoryMsg}= Portal Admin Category Notifications - set global variable ${AdminCategoryMsg} +#Category Notification functionality +# [TAGS] portal +# ${AdminCategoryMsg}= Portal Admin Category Notifications +# set global variable ${AdminCategoryMsg} Create a Test user for Application Admin -Test [TAGS] portal @@ -73,17 +73,17 @@ Delete Application Admin for Exisitng User [TAGS] portal Portal admin Delete Application Admin Existing User -Add Standard User Role for Existing user - [TAGS] portal - Portal admin Add Standard User Existing user +#Add Standard User Role for Existing user +# [TAGS] portal +# Portal admin Add Standard User Existing user -Edit Standard User Role for Existing user - [TAGS] portal - Portal admin Edit Standard User Existing user +#Edit Standard User Role for Existing user +# [TAGS] portal +# Portal admin Edit Standard User Existing user -Delete Standard User Role for Existing user - [TAGS] portal - Portal admin Delete Standard User Existing user +#Delete Standard User Role for Existing user +# [TAGS] portal +# Portal admin Delete Standard User Existing user Logout from Portal GUI as Portal Admin [TAGS] portal @@ -95,17 +95,17 @@ Login To Portal GUI as APP Admin [TAGS] portal Application admin Login To Portal GUI -Add Standard User Role for Existing user as APP Admin - [TAGS] portal - Application admin Add Standard User Existing user +#Add Standard User Role for Existing user as APP Admin +# [TAGS] portal +# Application admin Add Standard User Existing user -Edit Standard User Role for Existing user as APP Admin - [TAGS] portal - Application admin Edit Standard User Existing user +#Edit Standard User Role for Existing user as APP Admin +# [TAGS] portal +# Application admin Edit Standard User Existing user -Delete Standard User Role for Existing user as APP Admin - [TAGS] portal - Application admin Delete Standard User Existing user +#Delete Standard User Role for Existing user as APP Admin +# [TAGS] portal +# Application admin Delete Standard User Existing user Logout from Portal GUI as APP Admin [TAGS] portal |