Merge pull request #352 from CBIIT/Alena

updated Award Nomination scenarios. OA Intake scenario

src/test/java/APPS_COMMON/PageInitializers/PageInitializer.java

@@ -704,5 +704,9 @@ public static void initializeAllPages() {
 		cometsAnalyticsPage = new CometsAnalyticsPage();
 		cometsAnalyticsStepImp = new CometsAnalyticsStepImp();
 		NativeView_SideDoor_PageInitializer.initialize_Side_Door_Pages();
+
+		/** AWARD NOMINATION variables */
+		awardNominationPage = new AwardNominationPage();
+		awardNominationStepsImplementation = new AwardNominationStepsImplementation();
 	}
 }

src/test/java/ITSM/ITPG/features/Nativeview.feature

@@ -1,25 +1,24 @@
 @ITAONative
 Feature: ITO feature files
-	
-		@ITAONativeApprove
-    Scenario: Validate ITO approve test case from Native View
+
+  @ITAONativeApprove
+  Scenario: Validate ITO approve test case from Native View
     Given User opens IT Procurement Governance Application in browser
     When User Logins to the application
     Then Go to Native view
-  #  Then Click on Elevate Permision
     Then Go to All Ideas
     Then start a new idea case
     Then Enter Idea case details
-		Then Click on Save and Continue
-		Then Open Latest Idea Case
-		Then Click on approve request
-		Then Open Latest Idea Case
-		Then Go to All Business Case
-		Then Open Latest Business Case
-		Then Update details on Business form and submit
+    Then Click on Save and Continue
+    Then Open Latest Idea Case
+    Then Click on approve request
+    Then Open Latest Idea Case
+    Then Go to All Business Case
     Then Open Latest Business Case
+    Then Update details on Business form and submit
+    Then Open Latest Business Case
+    Then Open Request Approval form and approve
+    Then Open Request Approval form and approve
+    Then Open Request Approval form and approve
     Then Open Request Approval form and approve
- 		Then Open Request Approval form and approve
-  	Then Open Request Approval form and approve
-  	Then Open Request Approval form and approve
 

src/test/java/ITSM/ITPG/steps/BusinessCaseFormSteps.java

@@ -38,7 +38,7 @@ public void navigateToQUickLin(String quickLinkOption) {
 	}
 
 	@Then("State is updated to {string}")
-	public void verifystate(String expectedState) throws Exception {
+	public void verifyState(String expectedState) throws Exception {
 		Thread.sleep(7000);
 		String actualState = businessCaseFormPage.getState();
 		CucumberLogUtils.logScreenshot();
@@ -54,14 +54,10 @@ public void login() throws Exception {
 			loginStepsImpl.clckOnLoginButton();
 		}
 		loginStepsImpl.enterUsername("");
-		String decyptedPass = EncryptionUtils.decrypt("");
+		String decryptedPass = EncryptionUtils.decrypt("");
 		CucumberLogUtils.logScreenshot();
-		// loginStepsImpl.enterUsername(ConfUtils.getProperty("Username"));
-		// decyptedPass=EncryptionUtils.decrypt(ConfUtils.getProperty("Password"));
-		loginStepsImpl.enterPassword(decyptedPass);
+		loginStepsImpl.enterPassword(decryptedPass);
 		CucumberLogUtils.logScreenshot();
-		// loginPage.enterUsername(ConfigFileReader.getConfigFileReader().getUserName());
-		// loginPage.enterPassword(ConfigFileReader.getConfigFileReader().getPassword());
 		loginStepsImpl.clickOnSignInButton();
 
 	}
@@ -208,16 +204,9 @@ public void approveRequest() {
 
 	@Then("Open latest Business Case")
 	public void openLatestBusinessCase() {
-		// businessCaseFormPage.sortCreatedDateForBusinessCasesInDecendingOrder();
 		businessCaseFormPage.clickOnFirstBusinessCase();
 	}
 
-	@Then("Open latest business Case")
-	public void openLatestIdeaCase() {
-		// businessCaseFormPage.sortCreatedDateForIdeaCasesInDecendingOrder();
-		businessCaseFormPage.clickOnFirstIdeaCase();
-	}
-
 	@Then("verify that Assistance Provided button is available and moves the business case back in open state")
 	public void verifyStateAfterAssistanceProvided() {
 		businessCaseFormPage.verifyStateAfterAssistanceProvided();

src/test/java/PLATFORM_BUSINESS/CADSR/steps/ServicePortalSteps.java

@@ -418,7 +418,7 @@ public void assertCurationCountAs10() {
 	}
 
 	@Then("Verify Email notification with subject as {string}")
-	public void verifyEmailkkk(String subject) throws InterruptedException {
+	public void verifyEmail(String subject) throws InterruptedException {
 		boolean status = servicePortalPage.verifyEmail(subject);
 		Assert.assertEquals(true, status);
 	}

src/test/java/PLATFORM_BUSINESS/NCCR/features/NCCRFlow.feature

@@ -20,6 +20,4 @@ Feature: NCCR flow
     When User clicks Show Filter icon
     Then User can see Load Filter, Save Filter, Add Sort, and New Criteria buttons
     And User can close filter
-    And User can see pagination for All Data Requests tab
-
-
+    And User can see pagination for All Data Requests tab

src/test/java/PLATFORM_BUSINESS/OA_Intake/features/OAIntakeForm.feature

@@ -70,3 +70,24 @@ Feature: Create OA Intake form
     When User clicks on  OA Intake Home button
     Then User can verify they are redirected to Home Page
     And User logs out of OA Intake application
+
+  @selenium @Alena @Regression @OAIntake-332 @OAIntake-670 @OAIntake-669
+  Scenario: Requestor (Requested For) Queue for Negotiated Contracts
+    Given Leadership User logged in to OA Intake Portal
+    And User clicks on Requestor (Requested For) Queue tab
+    And User can verify page header as "Requestor (Requested For) Queue for Negotiated Contracts "
+    And User can see New Request button
+    And User can see Contact Support button
+    And User can verify Purchasing Online Tracking System (POTS) hyperlink is displayed
+    When User clicks Purchasing Online Tracking System (POTS) hyperlink
+    Then User is redirected to authentication page
+    And User can verify FFRDC Contract Administration System (FCAS) hyperlink is displayed
+    And User can verify that OA Intakes are pre-filtered for a logged in Leadership User
+    And User can verify that Request ID column can be sorted in descending and ascending order
+    And User can verify that Status column can be sorted in descending and ascending order
+    And User can verify that Request Title column can be sorted in descending and ascending order
+    And User can verify that Requestor (Requested For) column can be sorted in descending and ascending order
+    And User can verify that Submitter column can be sorted in descending and ascending order
+    And User can verify that Created On column can be sorted in descending and ascending order
+    And User can verify that Status Date column can be sorted in descending and ascending order
+    And User logs out of OA Intake application

src/test/java/PLATFORM_BUSINESS/OA_Intake/pages/OAIntakePage.java

@@ -71,11 +71,11 @@ public OAIntakePage() {
     public WebElement recompeteContract;
 
     /**  Re-compete Contract Number field */
-    @FindBy(xpath = "//*[@id='sp_formfield_contract_number']")
+    @FindBy(xpath = "//div[@id='s2id_sp_formfield_previous_contract_num']")
     public WebElement previousContractNumberField;
 
     /**  Previous Number field */
-    @FindBy(xpath = "//*[@id='sp_formfield_previous_co']")
+    @FindBy(xpath = "(//a[@class='select2-choice select2-default form-control'])[2]")
     public WebElement previousBuyerField;
 
     /**  Recommended Contract Mechanism dropdown*/
@@ -151,15 +151,15 @@ public OAIntakePage() {
     public WebElement modalSubmitButton;
 
     /**Confirmation Modal Text Task Order Acquisition Plan*/
-    @FindBy(xpath = "//ul//li[contains(text(),'Task Order Acquisition Plans (TOAPs) are required for both Internal and External Call/ Order submissions.')]")
+    @FindBy(xpath = "//li[.='Task Order Acquisition Plans (TOAPs) are required for both Internal and External Call/ Order submissions.']")
     public WebElement textConfModalTaskOrderAcquisitionPlans;
 
     /**Confirmation Modal Text Concept SPL*/
     @FindBy(xpath = "//ul//li[contains(text(),'Please attach the concept/SPL approval and BSA minutes /waiver (if received).')]")
     public WebElement textConfModalConceptSPL;
 
     /**Confirmation Modal Text draft Statement of Work and IGCE*/
-    @FindBy(xpath = "//ul//li[contains(text(),'In order for your new requirement to be assigned, you must at a minimum submit a draft Statement of Work and IGCE!')]")
+    @FindBy(xpath = "//li[.='In order for your new requirement to be assigned, you are encouraged to submit AT A MINIMUM a draft Statement of Work and IGCE!']")
     public WebElement textConfModalDraftStWorkICGE;
 
     /**OA Intake Page header*/
@@ -245,4 +245,88 @@ public OAIntakePage() {
     /**profile Log Out option*/
     @FindBy(xpath = "(//a[.='Log out'])[1]")
     public WebElement profileLogOutOption;
+
+    /**Requsted For page header*/
+    @FindBy(xpath = "//h2[contains(text(),'Requestor (Requested For) Queue for ')]")
+    public WebElement pageHeaderRequestedFor;
+
+    /**New Request button*/
+    @FindBy(xpath = "//h2[.='New Request']")
+    public WebElement buttonNewRequest;
+
+    /**Contact Support button*/
+    @FindBy(xpath = "//h2[.='Contact Support']")
+    public WebElement buttonContactSupport;
+
+    /**hyperlink POTS*/
+    @FindBy(xpath = "//a[@href='https://pots.nci.nih.gov']")
+    public WebElement hyperlinkPOTS;
+
+    /**NIH login content*/
+    @FindBy(xpath = "//main[@class='nih-login-content']")
+    public WebElement nihLoginContent;
+
+    /**hyperlink FCAS*/
+    @FindBy(xpath = "//a[@href='https://fcas.cancer.gov/']")
+    public WebElement hyperlinkFCAS;
+
+    /**requestor breadcrumbs*/
+    @FindBy(xpath = "//a[contains(text(),'Requestor (Requested For) = Wanda Neal')]")
+    public WebElement requestorBreadcrumbs;
+
+    /**Request ID sort by ascending option*/
+    @FindBy(xpath = "//div[@title='Sort by Ascending'][contains(text(),'Request ID')]")
+    public WebElement sortAscendingRequestID;
+
+    /**Request ID sort by descending option*/
+    @FindBy(xpath = "//div[@title='Sort by Descending'][contains(text(),'Request ID')]")
+    public WebElement sortDescendingRequestID;
+
+    /**Status sort by ascending option*/
+    @FindBy(xpath = "(//div[@title='Sort by Ascending'][contains(text(),'Status')])[1]")
+    public WebElement sortAscendingStatus;
+
+    /**Status sort by descending option*/
+    @FindBy(xpath = "(//div[@title='Sort by Descending'][contains(text(),'Status')])[1]")
+    public WebElement sortDescendingStatus;
+
+    /**Request Title by ascending option*/
+    @FindBy(xpath = "//div[@title='Sort by Ascending'][contains(text(),'Request Title')]")
+    public WebElement sortAscendingRequestTitle;
+
+    /**Request Title by descending option*/
+    @FindBy(xpath = "//div[@title='Sort by Descending'][contains(text(),'Request Title')]")
+    public WebElement sortDescendingRequestTitle;
+
+    /**Requested For by ascending option*/
+    @FindBy(xpath = "//div[@title='Sort by Ascending'][contains(text(),' Requestor (Requested For')]")
+    public WebElement sortAscendingRequestedFor;
+
+    /**Requested For by descending option*/
+    @FindBy(xpath = "//div[@title='Sort by Descending'][contains(text(),' Requestor (Requested For')]")
+    public WebElement sortDescendingRequestedFor;
+
+    /**Submitter by ascending option*/
+    @FindBy(xpath = "//div[@title='Sort by Ascending'][contains(text(),' Submitter')]")
+    public WebElement sortAscendingSubmitter;
+
+    /**Submitter by descending option*/
+    @FindBy(xpath = "//div[@title='Sort by Descending'][contains(text(),' Submitter')]")
+    public WebElement sortDescendingSubmitter;
+
+    /**Created on by ascending option*/
+    @FindBy(xpath = "//div[@title='Sort by Ascending'][contains(text(),'Created On')]")
+    public WebElement sortAscendingCreatedOn;
+
+    /**Created on by descending option*/
+    @FindBy(xpath = "//div[@title='Sort by Descending'][contains(text(),'Created On')]")
+    public WebElement sortDescendingCreatedOn;
+
+    /**Status Date by ascending option*/
+    @FindBy(xpath = "//div[@title='Sort by Ascending'][contains(text(),'Status Date')]")
+    public WebElement sortAscendingStatusDate;
+
+    /**Status Date by ascending option*/
+    @FindBy(xpath = "//div[@title='Sort by Descending'][contains(text(),'Status Date')]")
+    public WebElement sortDescendingStatusDate;
 }