More spec fixes

Author: mereghost

app/models/project.rb

@@ -232,7 +232,7 @@ def project
   end
 
   def wiki
-    super&.enabled ? super : nil
+    super&.enabled and super
   end
 
   def <=>(other)

app/seeders/demo_data/wiki_seeder.rb

@@ -37,12 +37,11 @@ def initialize(project, project_data)
     end
 
     def seed_data!
-      create_project_wiki!
-
       text = project_data.lookup("wiki")
-
       return if text.blank?
 
+      create_project_wiki!
+
       if text.is_a? String
         text = [{ title: "Wiki", content: text }]
       end

modules/bim/app/seeders/bim.yml

@@ -244,7 +244,6 @@ projects:
       - work_package_tracking
       - gantt
       - news
-      - wiki
       - board_view
       - team_planner_view
       - documents
@@ -393,7 +392,6 @@ projects:
       - work_package_tracking
       - gantt
       - news
-      - wiki
       - board_view
       - team_planner_view
       - documents
@@ -875,7 +873,6 @@ projects:
       - work_package_tracking
       - gantt
       - news
-      - wiki
       - board_view
       - team_planner_view
     news:

modules/bim/app/seeders/bim/basic_data_seeder.rb

@@ -45,6 +45,7 @@ def data_seeder_classes
         ::BasicData::PrioritySeeder,
         ::Bim::BasicData::SettingSeeder,
         ::Bim::BasicData::ThemeSeeder
+
       ]
     end
   end

modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb

@@ -53,9 +53,9 @@ def group_name(reference)
 
     it "creates the BIM demo data" do
       expect(Project.count).to eq 4
-      expect(EnabledModule.count).to eq 29
+      expect(EnabledModule.count).to eq 26
       expect(WorkPackage.count).to eq 76
-      expect(Wiki.count).to eq 3
+      expect(Wiki.count).to eq 0
       expect(Query.count).to eq 29
       expect(Group.count).to eq 8
       expect(Type.count).to eq 7
@@ -138,7 +138,7 @@ def group_name(reference)
       it "does not create additional data and does not raise any errors" do
         expect(Project.count).to eq 4
         expect(WorkPackage.count).to eq 76
-        expect(Wiki.count).to eq 3
+        expect(Wiki.count).to eq 0
         expect(Query.count).to eq 29
         expect(Group.count).to eq 8
         expect(Type.count).to eq 7

spec/models/project_spec.rb

@@ -133,25 +133,6 @@
     end
   end
 
-  context "when the wiki module is enabled" do
-    let(:project) { create(:project, disable_modules: "wiki") }
-
-    before do
-      project.enabled_module_names = project.enabled_module_names | ["wiki"]
-      project.save
-      project.reload
-    end
-
-    it "creates a wiki" do
-      expect(project.wiki).to be_present
-    end
-
-    it "creates a wiki menu item named like the default start page" do
-      expect(project.wiki.wiki_menu_items).to be_one
-      expect(project.wiki.wiki_menu_items.first.title).to eq(project.wiki.start_page)
-    end
-  end
-
   describe "#copy_allowed?" do
     let(:user) { build_stubbed(:user) }
     let(:project) { build_stubbed(:project) }

spec/requests/api/v3/projects/copy/copy_resource_spec.rb

@@ -43,7 +43,8 @@
 
   shared_let(:source_project) do
     create(:project,
-           enabled_module_names: %w[work_package_tracking wiki],
+           :with_internal_wiki,
+           enabled_module_names: %w[work_package_tracking],
            custom_field_values: {
              text_custom_field.id => "source text",
              list_custom_field.id => list_custom_field.custom_options.last.id
@@ -158,7 +159,7 @@
         expect(project).to be_present
 
         expect(source_project.wiki.pages.count).to eq 1
-        expect(project.wiki.pages.count).to eq 0
+        expect(project.wiki).to be_nil
 
         expect(source_project.work_packages.count).to eq 1
         expect(project.work_packages.count).to eq 1