-
<%= f.text_field :comments, size: 100, container_class: '-wide' %>
diff --git a/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb b/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb
index 2adee36d2e..5502b6cc52 100644
--- a/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb
+++ b/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb
@@ -93,7 +93,7 @@ describe 'Work Package cost fields', type: :feature, js: true do
# Override costs
find('#cost_entry_costs').click
SeleniumHubWaiter.wait
- fill_in 'cost_entry_costs_edit', with: '15.52'
+ fill_in 'cost_entry_overridden_costs', with: '15.52'
click_on 'Save'
@@ -130,7 +130,7 @@ describe 'Work Package cost fields', type: :feature, js: true do
# Override costs
find('#cost_entry_costs').click
SeleniumHubWaiter.wait
- fill_in 'cost_entry_costs_edit', with: '1.350,25'
+ fill_in 'cost_entry_overridden_costs', with: '1.350,25'
click_on I18n.t(:button_save)
@@ -152,7 +152,7 @@ describe 'Work Package cost fields', type: :feature, js: true do
# Update the costs in german locale
SeleniumHubWaiter.wait
- fill_in 'cost_entry_costs_edit', with: '55.000,55'
+ fill_in 'cost_entry_overridden_costs', with: '55.000,55'
click_on I18n.t(:button_save)
expect(page).to have_selector('#cost_entry_costs', text: '55.000,55 EUR')
diff --git a/modules/ldap_groups/app/services/ldap_groups/synchronize_groups_service.rb b/modules/ldap_groups/app/services/ldap_groups/synchronize_groups_service.rb
index d18f1ead64..6aeb266552 100644
--- a/modules/ldap_groups/app/services/ldap_groups/synchronize_groups_service.rb
+++ b/modules/ldap_groups/app/services/ldap_groups/synchronize_groups_service.rb
@@ -72,7 +72,7 @@ module LdapGroups
if call.success?
Rails.logger.info("[LDAP groups] User '#{call.result.login}' created")
else
- Rails.logger.error("[LDAP groups] User '#{user}' could not be created: #{call.message}")
+ Rails.logger.error("[LDAP groups] User '#{call.result&.login}' could not be created: #{call.message}")
end
end
diff --git a/spec/features/projects/template_spec.rb b/spec/features/projects/template_spec.rb
index 7620ac51cc..40298ffe76 100644
--- a/spec/features/projects/template_spec.rb
+++ b/spec/features/projects/template_spec.rb
@@ -100,7 +100,9 @@ describe 'Project templates', type: :feature, js: true do
# It does not show the copy meta flags
expect(page).to have_no_selector('[data-qa-field-name="copyMembers"]')
- expect(page).to have_no_selector('[data-qa-field-name="sendNotifications"]')
+
+ # But shows the send notifications field
+ expect(page).to have_selector('[data-qa-field-name="sendNotifications"]')
# Update status to off track
status_field.select_option 'Off track'
diff --git a/spec/models/queries/notifications/notification_query_spec.rb b/spec/models/queries/notifications/notification_query_spec.rb
index e7dab0b5e4..acea32fca9 100644
--- a/spec/models/queries/notifications/notification_query_spec.rb
+++ b/spec/models/queries/notifications/notification_query_spec.rb
@@ -29,10 +29,17 @@
require 'spec_helper'
describe Queries::Notifications::NotificationQuery, type: :model do
- shared_let(:recipient) { FactoryBot.create :user }
+ shared_let(:project) { FactoryBot.create :project }
+
+ shared_let(:recipient) { FactoryBot.create :user, member_in_project: project, member_with_permissions: %i[view_work_packages] }
+
+ shared_let(:work_package) { FactoryBot.create :work_package, project: project }
+ shared_let(:notification) { FactoryBot.create :notification, recipient: recipient, project: project, resource: work_package }
let(:instance) { described_class.new(user: recipient) }
- let(:base_scope) { Notification.recipient(recipient) }
+ let(:base_scope) { Notification.visible(recipient).recipient(recipient) }
+
+ current_user { recipient }
context 'without a filter' do
describe '#results' do
@@ -49,9 +56,9 @@ describe Queries::Notifications::NotificationQuery, type: :model do
describe '#results' do
it 'is the same as handwriting the query' do
- expected = base_scope.where("notifications.read_ian IN ('t')").order(id: :desc)
+ expected = base_scope.merge(Notification.where("notifications.read_ian IN ('t')").order(id: :desc)).to_sql
- expect(instance.results.to_sql).to eql expected.to_sql
+ expect(instance.results.to_sql).to eql expected
end
end
@@ -114,11 +121,7 @@ describe Queries::Notifications::NotificationQuery, type: :model do
describe '#results' do
it 'is the same as handwriting the query' do
- expected = <<~SQL.squish
- SELECT "notifications".* FROM "notifications"
- WHERE "notifications"."recipient_id" = #{recipient.id}
- ORDER BY "notifications"."read_ian" DESC, "notifications"."id" DESC
- SQL
+ expected = base_scope.merge(Notification.order(read_ian: :desc, id: :desc)).to_sql
expect(instance.results.to_sql).to eql expected
end
@@ -132,11 +135,7 @@ describe Queries::Notifications::NotificationQuery, type: :model do
describe '#results' do
it 'is the same as handwriting the query' do
- expected = <<~SQL.squish
- SELECT "notifications".* FROM "notifications"
- WHERE "notifications"."recipient_id" = #{recipient.id}
- ORDER BY "notifications"."reason" DESC, "notifications"."id" DESC
- SQL
+ expected = base_scope.merge(Notification.order(reason: :desc, id: :desc)).to_sql
expect(instance.results.to_sql).to eql expected
end
@@ -170,12 +169,11 @@ describe Queries::Notifications::NotificationQuery, type: :model do
describe '#results' do
it 'is the same as handwriting the query' do
- expected = <<~SQL.squish
- SELECT "notifications"."reason", COUNT(*) FROM "notifications"
- WHERE "notifications"."recipient_id" = #{recipient.id}
- GROUP BY "notifications"."reason"
- ORDER BY "notifications"."reason" ASC
- SQL
+ scope = Notification
+ .group(:reason)
+ .order(reason: :asc)
+ .select(:reason, Arel.sql('COUNT(*)'))
+ expected = base_scope.merge(scope).to_sql
expect(instance.groups.to_sql).to eql expected
end
@@ -189,12 +187,11 @@ describe Queries::Notifications::NotificationQuery, type: :model do
describe '#results' do
it 'is the same as handwriting the query' do
- expected = <<~SQL.squish
- SELECT "notifications"."project_id", COUNT(*) FROM "notifications"
- WHERE "notifications"."recipient_id" = #{recipient.id}
- GROUP BY "notifications"."project_id"
- ORDER BY "notifications"."project_id" ASC
- SQL
+ scope = Notification
+ .group(:project_id)
+ .order(project_id: :asc)
+ .select(:project_id, Arel.sql('COUNT(*)'))
+ expected = base_scope.merge(scope).to_sql
expect(instance.groups.to_sql).to eql expected
end
diff --git a/spec/requests/api/v3/notifications/bulk_read_ian_resource_spec.rb b/spec/requests/api/v3/notifications/bulk_read_ian_resource_spec.rb
index a1837ae444..77ae690520 100644
--- a/spec/requests/api/v3/notifications/bulk_read_ian_resource_spec.rb
+++ b/spec/requests/api/v3/notifications/bulk_read_ian_resource_spec.rb
@@ -35,11 +35,16 @@ describe ::API::V3::Notifications::NotificationsAPI,
content_type: :json do
include API::V3::Utilities::PathHelper
- shared_let(:recipient) { FactoryBot.create :user }
+ shared_let(:project) { FactoryBot.create :project }
+
+ shared_let(:recipient) { FactoryBot.create :user, member_in_project: project, member_with_permissions: %i[view_work_packages] }
shared_let(:other_recipient) { FactoryBot.create :user }
- shared_let(:notification1) { FactoryBot.create :notification, recipient: recipient }
- shared_let(:notification2) { FactoryBot.create :notification, recipient: recipient }
- shared_let(:notification3) { FactoryBot.create :notification, recipient: recipient }
+
+ shared_let(:work_package) { FactoryBot.create :work_package, project: project }
+
+ shared_let(:notification1) { FactoryBot.create :notification, recipient: recipient, project: project, resource: work_package }
+ shared_let(:notification2) { FactoryBot.create :notification, recipient: recipient, project: project, resource: work_package }
+ shared_let(:notification3) { FactoryBot.create :notification, recipient: recipient, project: project, resource: work_package }
shared_let(:other_user_notification) { FactoryBot.create :notification, recipient: other_recipient }
let(:filters) { nil }
diff --git a/spec/requests/api/v3/notifications/bulk_unread_ian_resource_spec.rb b/spec/requests/api/v3/notifications/bulk_unread_ian_resource_spec.rb
index e8fb036494..cc93b286b4 100644
--- a/spec/requests/api/v3/notifications/bulk_unread_ian_resource_spec.rb
+++ b/spec/requests/api/v3/notifications/bulk_unread_ian_resource_spec.rb
@@ -35,12 +35,27 @@ describe ::API::V3::Notifications::NotificationsAPI,
content_type: :json do
include API::V3::Utilities::PathHelper
- shared_let(:recipient) { FactoryBot.create :user }
+ shared_let(:project) { FactoryBot.create :project }
+ shared_let(:work_package) { FactoryBot.create :work_package, project: project }
+
+ shared_let(:recipient) { FactoryBot.create :user, member_in_project: project, member_with_permissions: %i[view_work_packages] }
shared_let(:other_recipient) { FactoryBot.create :user }
- shared_let(:notification1) { FactoryBot.create :notification, recipient: recipient, read_ian: true }
- shared_let(:notification2) { FactoryBot.create :notification, recipient: recipient, read_ian: true }
- shared_let(:notification3) { FactoryBot.create :notification, recipient: recipient, read_ian: true }
- shared_let(:other_user_notification) { FactoryBot.create :notification, recipient: other_recipient, read_ian: true }
+ shared_let(:notification1) do
+ FactoryBot.create :notification, recipient: recipient, project: project, resource: work_package, read_ian: true
+ end
+ shared_let(:notification2) do
+ FactoryBot.create :notification, recipient: recipient, project: project, resource: work_package, read_ian: true
+ end
+ shared_let(:notification3) do
+ FactoryBot.create :notification, recipient: recipient, project: project, resource: work_package, read_ian: true
+ end
+ shared_let(:other_user_notification) do
+ FactoryBot.create :notification,
+ recipient: other_recipient,
+ read_ian: true,
+ project: project,
+ resource: work_package
+ end
let(:filters) { nil }
@@ -86,10 +101,10 @@ describe ::API::V3::Notifications::NotificationsAPI,
end
it 'sets the current users`s notifications matching the filter to read' do
- expect(::Notification.where(id: [notification1.id, notification2.id]).pluck(:read_ian))
+ expect(::Notification.where(id: [notification1.id, notification2.id]).order(id: :asc).pluck(:read_ian))
.to all(be_falsey)
- expect(::Notification.where(id: [other_user_notification, notification3.id]).pluck(:read_ian))
+ expect(::Notification.where(id: [other_user_notification.id, notification3.id]).order(id: :asc).pluck(:read_ian))
.to all(be_truthy)
end
end