Skip to content

Commit 50d89c9

Browse files
committed
Adapt specs to changed core-features
1 parent 0d14292 commit 50d89c9

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

spec/domain/alumni/applicable_groups_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
# Copyright (c) 2023, Pfadibewegung Schweiz. This file is part of
3+
# Copyright (c) 2023-2024, Pfadibewegung Schweiz. This file is part of
44
# hitobito_pbs and licensed under the Affero General Public License version 3
55
# or later. See the COPYING file at the top-level directory or at
66
# https://github.com/hitobito/hitobito_pbs.
@@ -49,7 +49,7 @@ def make_group(name, selfreg:, **opts)
4949
Group::Ehemalige.name.to_sym,
5050
name: 'Zürich',
5151
parent: groups(:berchtold),
52-
self_registration_role_type: 'Group::SilverscoutsRegion::Mitglied'
52+
self_registration_role_type: 'Group::Ehemalige::Mitglied'
5353
)
5454

5555
expect(subject.silverscout_group_ids).to match_array [selfreg_group.id]

spec/domain/export/tabular/people/households_spec.rb

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2012-2018, Pfadibewegung Schweiz. This file is part of
1+
# Copyright (c) 2012-2024, Pfadibewegung Schweiz. This file is part of
22
# hitobito and licensed under the Affero General Public License version 3
33
# or later. See the COPYING file at the top-level directory or at
44
# https://github.com/hitobito/hitobito.
@@ -57,7 +57,7 @@
5757
prefers_digital_correspondence: leader.prefers_digital_correspondence)
5858
end
5959

60-
xit "is exported with the previous sort order" do
60+
it "is exported" do
6161
expect(exporter.data_rows.to_a).to eq [[
6262
"Sehr geehrter Herr Dr. Leiter, sehr geehrte*r Schekka",
6363
"Bundes Leiter, AL Schekka",
@@ -75,25 +75,6 @@
7575
"nein"
7676
]]
7777
end
78-
79-
it "is exported with the current sort order" do
80-
expect(exporter.data_rows.to_a).to eq [[
81-
"Liebe*r Torben, lieber Scout",
82-
"AL Schekka, Bundes Leiter",
83-
nil,
84-
nil,
85-
nil,
86-
nil,
87-
"Schekka",
88-
"de",
89-
"ja",
90-
"BE",
91-
630906753,
92-
319329508,
93-
nil,
94-
"nein"
95-
]]
96-
end
9778
end
9879
end
9980
end

0 commit comments

Comments
 (0)