Merge branch 'master' of https://dev.finn.de/git/redmine-reporting

features/filter.feature

@@ -3,7 +3,7 @@ Feature: Filter
   @javascript
   Scenario: When using jump-to-project comming from the overall cost report to a projects report sets the project filter to that project
     Given there is a standard cost control project named "First Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the overall Cost Reports page
     And I jump to project "First Project"
     Then "First Project" should be selected for "project_id_arg_1_val"
@@ -11,7 +11,7 @@ Feature: Filter
   @javascript
   Scenario: When using jump-to-project comming from a projects cost report to the overall cost report page unsets the project filter
     Given there is a standard cost control project named "First Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the Cost Reports page for the project called "First Project"
     And I follow "Cost Reports"
     Then "" should be selected for "project_id_arg_1_val"
@@ -20,7 +20,7 @@ Feature: Filter
   Scenario: When using jump-to-project comming from a projects cost report to another projects report sets the project filter to the second project
     Given there is a standard cost control project named "First Project"
     And there is a standard cost control project named "Second Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the Cost Reports page for the project called "First Project"
     And I jump to project "Second Project"
     Then "Second Project" should be selected for "project_id_arg_1_val"
@@ -28,7 +28,7 @@ Feature: Filter
   @javascript
   Scenario: We got some awesome default settings
     Given there is a standard cost control project named "First Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the Cost Reports page for the project called "First Project"
     Then filter "spent_on" should be visible
     And filter "user_id" should be visible
@@ -36,7 +36,7 @@ Feature: Filter
   @javascript
   Scenario: A click on clear removes all filters
     Given there is a standard cost control project named "First Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the Cost Reports page for the project called "First Project"
     And I click on "Clear"
     Then filter "spent_on" should not be visible
@@ -45,7 +45,7 @@ Feature: Filter
   @javascript
   Scenario: A set filter is getting restored after reload
     Given there is a standard cost control project named "First Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the Cost Reports page for the project called "First Project"
     And I wait for Ajax
     And I click on "Clear"
@@ -58,7 +58,7 @@ Feature: Filter
   @javascript
   Scenario: A click on clear enables the option in the Add-Filter-Selectbox
     Given there is a standard cost control project named "First Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the Cost Reports page for the project called "First Project"
     And I wait for Ajax
     Then "user_id" should not be selectable from "add_filter_select"
@@ -70,7 +70,7 @@ Feature: Filter
   @javascript
   Scenario: Setting a Filter disables the option in the Add-Filter-Selectbox
     Given there is a standard cost control project named "First Project"
-    And I am logged in as "controller"
+    And I am already logged in as "controller"
     And I am on the Cost Reports page for the project called "First Project"
     And I wait for Ajax
     And I click on "Clear"

features/links.feature

@@ -103,9 +103,11 @@ Feature: Cost Reporting Linkage
     And the issue "manager issue" has 1 cost entry with the following:
       | user      | manager |
       | units     | 10      |
+      | cost type | word    |
     And the issue "another issue" has 1 cost entry with the following:
       | user      | manager |
       | units     | 5       |
+      | cost type | word    |
     And I am logged in as "manager"
     And I am on the page for the issue "manager issue"
     Then I should see "10.0 words"

features/navigations.feature

@@ -1,6 +1,5 @@
 Feature: Navigating to reports page
 
-  @javascript
   Scenario: Navigating to the cost report of a project which is a subproject
     Given there is 1 project with the following:
       | name | ParentProject |

features/saving.feature

@@ -23,7 +23,7 @@ Feature: Saving Queries
     And I click on "Save"
     And I fill in "Testreport" for "query_name"
     And I follow "Save" within "#save_as_form"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Testreport" within "#ur_caption"
     And I should see "Testreport" within "#private_sidebar_report_list"
     And I should see "Issue" in columns
@@ -49,13 +49,13 @@ Feature: Saving Queries
     And I click on "Clear"
     And I group columns by "Issue"
     And I group rows by "Project"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     And I set the filter "user_id" to the user with the login "developer" with the operator "!"
     And I click on "Save"
     And I fill in "Testreport" for "query_name"
     And I check "Public"
     And I follow "Save" within "#save_as_form"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Testreport" within "#ur_caption"
     And I should see "Testreport" within "#public_sidebar_report_list"
     And I should see "Issue" in columns
@@ -86,7 +86,7 @@ Feature: Saving Queries
     Then I should not see "Public"
     And I fill in "Testreport" for "query_name"
     And I follow "Save" within "#save_as_form"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Testreport" within "#ur_caption"
     And I should see "Testreport" within "#private_sidebar_report_list"
 
@@ -104,7 +104,7 @@ Feature: Saving Queries
     Then I should see "Public"
     And I fill in "Testreport" for "query_name"
     And I follow "Save" within "#save_as_form"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Testreport" within "#ur_caption"
     And I should see "Testreport" within "#private_sidebar_report_list"
     Then I should see "Save" within "#query-icon-save-as" # Save
@@ -113,7 +113,7 @@ Feature: Saving Queries
     And I check "Public"
     And I fill in "Testreport2" for "query_name"
     And I follow "Save" within "#save_as_form"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Testreport2" within "#ur_caption"
     And I should see "Testreport2" within "#public_sidebar_report_list"
     And I should see "Testreport" within "#private_sidebar_report_list"
@@ -130,12 +130,12 @@ Feature: Saving Queries
     And I click on "Save"
     And I fill in "Testreport" for "query_name"
     And I follow "Save" within "#save_as_form"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     And I should see "Testreport" within "#private_sidebar_report_list"
     And I click on "#query_saved_name"
     And I fill in "Renamed" for "value"
     And I press "Rename" within "#query_saved_name-inplaceeditor"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Renamed" within "#private_sidebar_report_list"
     And I should not see "Testreport" within "#private_sidebar_report_list"
 
@@ -152,12 +152,12 @@ Feature: Saving Queries
     And I fill in "Testreport" for "query_name"
     And I check "Public"
     And I follow "Save" within "#save_as_form"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Testreport" within "#public_sidebar_report_list"
     And I click on "#query_saved_name"
     And I fill in "Renamed" for "value"
     And I press "Rename" within "#query_saved_name-inplaceeditor"
-    And I wait for Ajax
+    And I wait 10 seconds for Ajax
     Then I should see "Renamed" within "#public_sidebar_report_list"
     Then I should not see "Testreport" within "#public_sidebar_report_list"
 

init.rb

@@ -11,7 +11,7 @@ Redmine::Plugin.register :redmine_reporting do
   author 'Konstantin Haase, Philipp Tessenow @ finnlabs'
   author_url 'http://finn.de/team'
   description 'The reporting plugin provides extended reporting functionality for Redmine including Cost Reports.'
-  version '2.4.0'
+  version '2.4.3'
 
   requires_redmine :version_or_higher => '0.9'
   requires_redmine_plugin :redmine_costs, :version_or_higher => '0.3'