Adapt specs to changed core-features

hitobito · Dec 18, 2024 · 50d89c9 · 50d89c9
1 parent 0d14292
commit 50d89c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/spec/domain/alumni/applicable_groups_spec.rb b/spec/domain/alumni/applicable_groups_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#  Copyright (c) 2023, Pfadibewegung Schweiz. This file is part of
+#  Copyright (c) 2023-2024, Pfadibewegung Schweiz. This file is part of
 #  hitobito_pbs and licensed under the Affero General Public License version 3
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_pbs.
@@ -49,7 +49,7 @@ def make_group(name, selfreg:, **opts)
         Group::Ehemalige.name.to_sym,
         name: 'Zürich',
         parent: groups(:berchtold),
-        self_registration_role_type: 'Group::SilverscoutsRegion::Mitglied'
+        self_registration_role_type: 'Group::Ehemalige::Mitglied'
       )
 
       expect(subject.silverscout_group_ids).to match_array [selfreg_group.id]

diff --git a/spec/domain/export/tabular/people/households_spec.rb b/spec/domain/export/tabular/people/households_spec.rb
@@ -1,4 +1,4 @@
-#  Copyright (c) 2012-2018, Pfadibewegung Schweiz. This file is part of
+#  Copyright (c) 2012-2024, Pfadibewegung Schweiz. This file is part of
 #  hitobito and licensed under the Affero General Public License version 3
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito.
@@ -57,7 +57,7 @@
           prefers_digital_correspondence: leader.prefers_digital_correspondence)
       end
 
-      xit "is exported with the previous sort order" do
+      it "is exported" do
         expect(exporter.data_rows.to_a).to eq [[
           "Sehr geehrter Herr Dr. Leiter, sehr geehrte*r Schekka",
           "Bundes Leiter, AL Schekka",
@@ -75,25 +75,6 @@
           "nein"
         ]]
       end
-
-      it "is exported with the current sort order" do
-        expect(exporter.data_rows.to_a).to eq [[
-          "Liebe*r Torben, lieber Scout",
-          "AL Schekka, Bundes Leiter",
-          nil,
-          nil,
-          nil,
-          nil,
-          "Schekka",
-          "de",
-          "ja",
-          "BE",
-          630906753,
-          319329508,
-          nil,
-          "nein"
-        ]]
-      end
     end
   end
 end