fix specs

modules/costs/app/components/time_entries/activity_form.rb

@@ -41,7 +41,7 @@ class ActivityForm < ApplicationForm
           focusDirectly: false,
           multiple: false,
           decorated: true,
-          disabled: project.blank?,
+          disabled: !project_or_work_package_selected?,
           append_to: "#time-entry-dialog"
         }
       ) do |select|
@@ -53,14 +53,14 @@ class ActivityForm < ApplicationForm
 
     private
 
-    delegate :project, to: :model
+    delegate :project, :work_package, to: :model
+
+    def project_or_work_package_selected?
+      work_package.present? || project.present?
+    end
 
     def placeholder_text
-      if project.blank?
-        I18n.t("time_entry.activity_select_project_first")
-      else
-        I18n.t("time_entry.activity_select")
-      end
+      I18n.t("placeholder_activity_select_work_package_first") unless project_or_work_package_selected?
     end
 
     def activities

modules/costs/config/locales/en.yml

@@ -145,6 +145,8 @@ en:
   label_valid_from: "Valid from"
   label_yes: "Yes"
 
+  placeholder_activity_select_work_package_first: Work package selection is required first
+
   notice_something_wrong: "Something went wrong. Please try again."
   notice_successful_restore: "Successful restore."
   notice_successful_lock: "Locked successfully."

spec/features/support/components/time_logging_modal.rb

@@ -40,12 +40,12 @@ class TimeLoggingModal
                 :user_field
 
     def initialize
-      @activity_field = EditField.new(page, "activity")
-      @comment_field = EditField.new(page, "comment")
-      @hours_field = EditField.new(page, "hours")
-      @spent_on_field = EditField.new(page, "spentOn")
-      @work_package_field = EditField.new(page, "workPackage")
-      @user_field = EditField.new(page, "user")
+      @activity_field = EditField.new(page, "time_entry[activity_id]")
+      @comment_field = EditField.new(page, "time_entry[comment]")
+      @hours_field = EditField.new(page, "time_entry[hours]")
+      @spent_on_field = EditField.new(page, "time_entry[spent_on]")
+      @work_package_field = EditField.new(page, "time_entry[work_package_id]")
+      @user_field = EditField.new(page, "time_entry[user_id]")
     end
 
     def is_visible(visible)
@@ -55,7 +55,7 @@ def is_visible(visible)
             .to have_text(I18n.t("js.button_log_time"))
         end
       else
-        expect(page).to have_no_css ".spot-modal"
+        expect(page).to have_no_css "dialog#time-entry-dialog"
       end
     end
 
@@ -138,7 +138,7 @@ def field_object(field_name)
     end
 
     def modal_container
-      page.find(".spot-modal")
+      page.find("dialog#time-entry-dialog")
     end
   end
 end