-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' of ssh://git.devops.innovateuk.org/ifs/inn…
…ovation-funding-service into development
- Loading branch information
Showing
4 changed files
with
28 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,24 @@ | ||
| *** Settings *** | ||
| Documentation IFS-8328 KTP Project Setup - finance checks (internal and external) | ||
| ... | ||
| ... IFS-8695 Amending the project duration date doesn't reflect the change in other screens | ||
| ... | ||
| Suite Setup Custom Suite Setup | ||
| Resource ../../resources/defaultResources.robot | ||
| Resource ../../resources/common/Applicant_Commons.robot | ||
| Resource ../../resources/common/Competition_Commons.robot | ||
| Resource ../../resources/common/PS_Common.robot | ||
|
|
||
| *** Variables *** | ||
| ${KTPapplication} KTP in panel application | ||
| ${ktpProjectID} ${project_ids["${KTPapplication}"]} | ||
| ${KTPapplicationId} ${application_ids["${KTPapplication}"]} | ||
| ${KTPcompetiton} KTP in panel | ||
| ${KTPcompetitonId} ${competition_ids["${KTPcompetiton}"]} | ||
| ${ktpLeadOrgName} A base of knowledge | ||
| ${ktpLeadOrgID} ${organisation_ids["${ktpLeadOrgName}"]} | ||
| ${ktpPartnerOrgName} Ludlow | ||
| ${ktpPartnerOrgId} ${organisation_ids["${ktpPartnerOrgName}"]} | ||
| &{FinanceUser} [email protected] password=${short_password} | ||
| &{ifsAdmin} [email protected] password=${short_password} | ||
| &{ktpLead} [email protected] password=${short_password} | ||
| &{ktpPartner} [email protected] password=${short_password} | ||
| ${KTPapplication} KTP in panel application | ||
| ${ktpProjectID} ${project_ids["${KTPapplication}"]} | ||
| ${KTPcompetiton} KTP in panel | ||
| ${KTPcompetitonId} ${competition_ids["${KTPcompetiton}"]} | ||
| ${ktpLeadOrgName} A base of knowledge | ||
| ${ktpLeadOrgID} ${organisation_ids["${ktpLeadOrgName}"]} | ||
| ${ktpPartnerOrgName} Ludlow | ||
| ${ktpPartnerOrgId} ${organisation_ids["${ktpPartnerOrgName}"]} | ||
| &{ktpLead} [email protected] password=${short_password} | ||
|
|
||
| *** Test Cases *** | ||
| Internal user can edit the duration of the project | ||
|
|
@@ -31,7 +29,7 @@ Internal user can edit the duration of the project | |
| Then The user should see the element jQuery = dt:contains("Duration") ~ dd:contains("30 months") | ||
|
|
||
| Internal user can edit KTP finances in project setup | ||
| [Documentation] IFS-8328 | ||
| [Documentation] IFS-8328 IFS-8695 | ||
| Given the user navigates to the page ${server}/project-setup-management/project/${ktpProjectID}/finance-check/organisation/${ktpLeadOrgID}/eligibility | ||
| When The user clicks the button/link jQuery = button:contains("Open all") | ||
| Then The user edits the KTP costs section | ||
|
|
@@ -60,21 +58,21 @@ Internal user checks the Finance overview page | |
|
|
||
| The lead checks the Finance overview page | ||
| [Documentation] IFS-8328 | ||
| Given Log in as a different user [email protected] Passw0rd1357 | ||
| Given Log in as a different user &{ktpLead} | ||
| And The user navigates to the page ${server}/project-setup/project/${ktpProjectID}/finance-checks | ||
| When The user clicks the button/link link = your project finance overview | ||
| Then the user verifies the values in the finance summary table after editing the project costs | ||
| And the user checks the values in the projects costs summary table | ||
| And The user clicks the button/link link = Back to finance checks | ||
|
|
||
| The lead checks the Eligibility check page | ||
| [Documentation] IFS-8328 | ||
| [Documentation] IFS-8328 IFS-8695 | ||
| When The user clicks the button/link link = review your project finances | ||
| Then the user confirms the values in the finance table | ||
|
|
||
| The partner checks the Finance overview page | ||
| [Documentation] IFS-8328 | ||
| Given Log in as a different user [email protected] Passw0rd1357 | ||
| Given Log in as a different user &{collaborator1_credentials} | ||
| And The user navigates to the page ${server}/project-setup/project/${ktpProjectID}/finance-checks | ||
| When The user clicks the button/link link = project finance overview | ||
| Then the user verifies the values in the finance summary table after editing the project costs | ||
|
|
@@ -131,7 +129,7 @@ the user approves viability | |
|
|
||
| the user confirms the values in the finance table | ||
| the user should see the element jQuery = th:contains("Project duration") | ||
| # the user should see the element jQuery = td:nth-child(1):contains("30 months") | ||
| the user should see the element jQuery = td:nth-child(1):contains("30 months") | ||
| the user should see the element jQuery = th:contains("Total costs") | ||
| the user should see the element jQuery = td:nth-child(2):contains("£720") | ||
| the user should see the element jQuery = th:contains("Funding level (%)") | ||
|
|
||