diff --git a/features/calculations.feature b/features/calculations.feature index 7a36bc1366..d2f8407c0a 100644 --- a/features/calculations.feature +++ b/features/calculations.feature @@ -26,6 +26,9 @@ Feature: Cost Reporting Calculations | hours | 10 | | user | manager | | spent on | 30 months ago | + And there is 1 user with: + | login | admin | + | admin | true | And I am already logged in as "admin" And I am on the Cost Reports page for the project called "Cost Project" without filters or groups Then I should see "10.00" # 1 EUR x 10 (hours) diff --git a/features/grouping.feature b/features/grouping.feature index dda7063482..fca45d8dd7 100644 --- a/features/grouping.feature +++ b/features/grouping.feature @@ -8,58 +8,58 @@ Feature: Groups @javascript Scenario: We got some awesome default settings Then I should see "Week (Spent)" in columns - And I should see "WorkPackage" in rows + And I should see "Work package" in rows @javascript Scenario: A click on clear removes all groups When I click on "Clear" Then I should not see "Week (Spent)" in columns - And I should not see "WorkPackage" in rows + And I should not see "Work package" in rows And I group rows by "User" And I group rows by "Cost type" When I click on "Clear" Then I should not see "Week (Spent)" in columns - And I should not see "WorkPackage" in rows + And I should not see "Work package" in rows And I should not see "User" in rows And I should not see "Cost type" in rows @javascript Scenario: Groups can be added to either rows or columns When I click on "Clear" - And I group columns by "WorkPackage" + And I group columns by "Work package" - Then I should see "WorkPackage" in columns + Then I should see "Work package" in columns When I group rows by "Project" Then I should see "Project" in rows @javascript Scenario: Groups can be removed from rows and columns When I click on "Clear" - And I group columns by "WorkPackage" + And I group columns by "Work package" And I group rows by "Project" - Then I should see "WorkPackage" in columns + Then I should see "Work package" in columns And I should see "Project" in rows When I remove "Project" from rows - And I remove "WorkPackage" from columns + And I remove "Work package" from columns - Then I should not see "WorkPackage" in columns + Then I should not see "Work package" in columns And I should not see "Project" in rows @javascript Scenario: Groups get restored after sending a query When I click on "Clear" - And I group columns by "WorkPackage" + And I group columns by "Work package" And I group columns by "Project" And I group rows by "User" And I group rows by "Cost type" And I send the query Then I should see "Project" in columns - And I should see "WorkPackage" in columns + And I should see "Work package" in columns And I should see "User" in rows And I should see "Cost type" in rows diff --git a/features/links.feature b/features/links.feature index 1f9a8d6f52..8dd193aa68 100644 --- a/features/links.feature +++ b/features/links.feature @@ -20,15 +20,15 @@ Feature: Cost Reporting Linkage And the user "manager" has: | hourly rate | 10 | | default rate | 10 | - And the user "manager" has 1 work_package with: + And the user "manager" has 1 issue with: | subject | manager work_package | - And the work_package "manager work_package" has 1 time entry with the following: + And the issue "manager work_package" has 1 time entry with the following: | user | manager | | hours | 10 | And there is 1 cost type with the following: | name | word | | cost rate | 1.01 | - And the work_package "manager work_package" has 1 cost entry with the following: + And the work package "manager work_package" has 1 cost entry with the following: | units | 7 | | user | manager | | cost type | word | @@ -42,15 +42,18 @@ Feature: Cost Reporting Linkage @javascript Scenario: If Given there is a standard cost control project named "Standard Project" - And the user "manager" has 1 work_package with: + And the user "manager" has 1 issue with: | subject | manager work_package | And there is 1 cost type with the following: | name | word | | cost rate | 1.01 | - And the work_package "manager work_package" has 1 cost entry with the following: + And the work package "manager work_package" has 1 cost entry with the following: | units | 7 | | user | manager | | cost type | word | + And there is 1 user with: + | login | admin | + | admin | true | And I am already logged in as "admin" And I am on the Cost Reports page for the project called "Standard Project" @@ -68,18 +71,18 @@ Feature: Cost Reporting Linkage Given there is a standard cost control project named "Standard Project" And the user "manager" has: | default rate | 10 | - And the user "manager" has 1 work_package with: + And the user "manager" has 1 issue with: | subject | manager work_package | - And the user "manager" has 1 work_package with: + And the user "manager" has 1 issue with: | subject | another work_package | - And the work_package "manager work_package" has 1 time entry with the following: + And the issue "manager work_package" has 1 time entry with the following: | user | manager | | hours | 10 | - And the work_package "another work_package" has 1 time entry with the following: + And the issue "another work_package" has 1 time entry with the following: | user | manager | | hours | 5 | And I am already logged in as "manager" - And I am on the page for the work_package "manager work_package" + And I am on the page for the issue "manager work_package" Then I should see "10.00 hours" When I follow "10.00 hours" @@ -98,20 +101,20 @@ Feature: Cost Reporting Linkage And there is 1 cost type with the following: | name | word | | cost rate | 10 | - And the user "manager" has 1 work_package with: + And the user "manager" has 1 issue with: | subject | manager work_package | - And the user "manager" has 1 work_package with: + And the user "manager" has 1 issue with: | subject | another work_package | - And the work_package "manager work_package" has 1 cost entry with the following: + And the work package "manager work_package" has 1 cost entry with the following: | user | manager | | units | 10 | | cost type | word | - And the work_package "another work_package" has 1 cost entry with the following: + And the work package "another work_package" has 1 cost entry with the following: | user | manager | | units | 5 | | cost type | word | And I am already logged in as "manager" - And I am on the page for the work_package "manager work_package" + And I am on the page for the work package "manager work_package" Then I should see "10.0 words" @@ -127,9 +130,9 @@ Feature: Cost Reporting Linkage @javascript Scenario: Reporting on the project page should be accessible from the spent time Given there is a standard cost control project named "Standard Project" - And the project "Standard Project" has 1 work_package with the following: + And the project "Standard Project" has 1 issue with the following: | subject | test_work_package | - And the work_package "test_work_package" has 1 time entry with the following: + And the issue "test_work_package" has 1 time entry with the following: | hours | 1.00 | | user | manager | And I am already logged in as "manager" diff --git a/features/permission_variations.feature b/features/permission_variations.feature index 0871ddf2e9..b33ba2f97a 100644 --- a/features/permission_variations.feature +++ b/features/permission_variations.feature @@ -22,6 +22,9 @@ Feature: Permissions Scenario: Admin sees everything Given there is a standard permission test project named "Permission_Test" + And there is 1 user with: + | login | admin | + | admin | true | And I am already logged in as "admin" And I am on the overall Cost Reports page without filters or groups Then I should see "Cost Report" within "#content" diff --git a/features/saving.feature b/features/saving.feature index b2e13510b2..025fa0dfbf 100644 --- a/features/saving.feature +++ b/features/saving.feature @@ -17,7 +17,7 @@ Feature: Saving Queries And I am on the Cost Reports page for the project called "First Project" Then I should see "Save" within "#query-icon-save-as" And I click on "Clear" - And I group columns by "WorkPackage" + And I group columns by "Work package" And I group rows by "Project" And I set the filter "user_id" to the user with the login "developer" with the operator "!" And I click on "Save" @@ -25,7 +25,7 @@ Feature: Saving Queries And I click on "Save" within "#save_as_form" Then I should see "Testreport" within "#ur_caption" And I should see "Testreport" within "#private_sidebar_report_list" - And I should see "WorkPackage" in columns + And I should see "Work package" in columns And I should see "Project" in rows And filter "user_id" should be visible @@ -46,7 +46,7 @@ Feature: Saving Queries And I am on the Cost Reports page for the project called "First Project" Then I should see "Save" within "#query-icon-save-as" And I click on "Clear" - And I group columns by "WorkPackage" + And I group columns by "Work package" And I group rows by "Project" And I set the filter "user_id" to the user with the login "developer" with the operator "!" And I click on "Save" @@ -55,7 +55,7 @@ Feature: Saving Queries And I click on "Save" within "#save_as_form" Then I should see "Testreport" within "#ur_caption" And I should see "Testreport" within "#public_sidebar_report_list" - And I should see "WorkPackage" in columns + And I should see "Work package" in columns And I should see "Project" in rows And filter "user_id" should be visible diff --git a/features/step_definitions/custom_steps.rb b/features/step_definitions/custom_steps.rb index 1a48679de8..d62ed64b8b 100644 --- a/features/step_definitions/custom_steps.rb +++ b/features/step_definitions/custom_steps.rb @@ -5,7 +5,7 @@ Given /^there is a standard permission test project named "([^\"]*)"$/ do |name| And the project "#{name}" has the following types: | name | position | | Bug | 1 | - And the project "#{name}" has 1 work_package with: + And the project "#{name}" has 1 issue with: | subject | #{name}work_package | And there is a role "Testuser" And the role "Testuser" may have the following rights: @@ -34,17 +34,17 @@ Given /^there is a standard permission test project named "([^\"]*)"$/ do |name| And there is 1 cost type with the following: | name | ten | | cost rate | 10.00 | - And the work_package "#{name}work_package" has 1 time entry with the following: + And the issue "#{name}work_package" has 1 time entry with the following: | hours | 1 | | user | testuser | - And the work_package "#{name}work_package" has 1 time entry with the following: + And the issue "#{name}work_package" has 1 time entry with the following: | hours | 2 | | user | otheruser | - And the work_package "#{name}work_package" has 1 cost entry with the following: + And the work package "#{name}work_package" has 1 cost entry with the following: | units | 1 | | user | testuser | | cost type | one | - And the work_package "#{name}work_package" has 1 cost entry with the following: + And the work package "#{name}work_package" has 1 cost entry with the following: | units | 1 | | user | otheruser | | cost type | ten |