Skip to content

Commit 3d58ba4

Browse files
committed
Handling some of the errors...poorly
1 parent f46bdd8 commit 3d58ba4

11 files changed

Lines changed: 30 additions & 22 deletions

File tree

app/models/project.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def project
232232
end
233233

234234
def wiki
235-
super.enabled ? super : nil
235+
super&.enabled ? super : nil
236236
end
237237

238238
def <=>(other)
@@ -243,7 +243,7 @@ def to_s
243243
name
244244
end
245245

246-
def workspace_label
246+
def w
247247
case workspace_type
248248
when "program"
249249
I18n.t("label_program")

app/seeders/demo_data/version_builder.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ def version
7272
def set_wiki!(version, config)
7373
return unless config
7474

75+
# FIXME: find a better solution to handle all things wiki seeding. - @mereghost
76+
77+
unless Wiki.exists?(project: version.project)
78+
Wiki.create!(project: version.project, start_page: "Wiki")
79+
version.project.reload
80+
end
81+
7582
version.wiki_page_title = config["title"]
7683

7784
Journal::NotificationConfiguration.with false do

app/seeders/demo_data/wiki_seeder.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ def initialize(project, project_data)
3737
end
3838

3939
def seed_data!
40+
create_project_wiki!
41+
4042
text = project_data.lookup("wiki")
4143

4244
return if text.blank?
@@ -55,6 +57,14 @@ def seed_data!
5557
end
5658
end
5759

60+
# FIXME: find a better solution to handle all things wiki seeding. - @mereghost
61+
def create_project_wiki!
62+
return project.reload.wiki if Wiki.exists?(project: @project)
63+
64+
Wiki.create!(project: @project, start_page: "Wiki")
65+
@project.reload
66+
end
67+
5868
def create_wiki_page!(data, project:, parent: nil)
5969
WikiPage.create!(
6070
wiki: project.wiki,

app/seeders/standard.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ projects:
215215
- work_package_tracking
216216
- news
217217
- gantt
218-
- wiki
219218
- board_view
220219
- team_planner_view
221220
- meetings
@@ -538,7 +537,6 @@ projects:
538537
modules:
539538
- backlogs
540539
- news
541-
- wiki
542540
- work_package_tracking
543541
- gantt
544542
- board_view

spec/controllers/activities_controller_spec.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@
104104

105105
describe "with activated activity module" do
106106
let(:project) do
107-
create(:project,
108-
enabled_module_names: %w[activity wiki])
107+
create(:project, enabled_module_names: %w[activity])
109108
end
110109

111110
it "renders activity" do
@@ -117,8 +116,7 @@
117116

118117
describe "without activated activity module" do
119118
let(:project) do
120-
create(:project,
121-
enabled_module_names: %w[wiki])
119+
create(:project, enabled_module_names: [])
122120
end
123121

124122
it "renders 403" do

spec/features/activities/wiki_activity_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
edit_wiki_pages
3838
view_wiki_edits] })
3939
end
40-
let(:project) { create(:project, enabled_module_names: %w[wiki activity]) }
40+
let(:project) { create(:project, :with_internal_wiki, enabled_module_names: %w[activity]) }
4141
let(:wiki) { project.wiki }
4242
let(:editor) { Components::WysiwygEditor.new }
4343

@@ -106,6 +106,6 @@
106106
visit project_activity_index_path(project)
107107

108108
expect(page)
109-
.to have_no_content("Wiki edits")
109+
.to have_no_text("Wiki edits")
110110
end
111111
end

spec/features/external_link_capture_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
RSpec.describe "External link capture", :js, :selenium do
3434
shared_let(:admin) { create(:admin) }
3535

36-
let(:project) { create(:project, enabled_module_names: %w[wiki]) }
36+
let(:project) { create(:project, :with_internal_wiki) }
3737
let(:external_url) { "https://www.openproject.org/" }
3838
let!(:wiki_page) do
3939
create(:wiki_page,

spec/features/wiki/wiki_page_external_link_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
current_user { admin }
3636

3737
let(:external_url) { "https://www.openprojet.org/" }
38-
let(:project) { create(:project, enabled_module_names: %w[wiki]) }
38+
let(:project) { create(:project, :with_internal_wiki) }
3939
let!(:wiki_page) do
4040
create(:wiki_page,
4141
wiki: project.wiki,

spec/features/wysiwyg/bold_behavior_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
RSpec.describe "Wysiwyg bold behavior", :js do
3434
current_user { create(:admin) }
3535

36-
let(:project) { create(:project, enabled_module_names: %w[wiki]) }
36+
let(:project) { create(:project, :with_internal_wiki) }
3737
let(:editor) { Components::WysiwygEditor.new }
3838

3939
def mac_osx?

spec/lib/open_project/text_formatting/markdown/child_pages_macro_spec.rb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,13 @@ def controller
4040
end
4141

4242
shared_let(:project) do
43-
create(:valid_project,
44-
enabled_module_names: %w[wiki])
43+
create(:valid_project, :with_internal_wiki)
4544
end
4645
shared_let(:member_project) do
47-
create(:valid_project,
48-
identifier: "member-project",
49-
enabled_module_names: %w[wiki])
46+
create(:valid_project, :with_internal_wiki, identifier: "member-project")
5047
end
5148
shared_let(:invisible_project) do
52-
create(:valid_project,
53-
identifier: "other-project",
54-
enabled_module_names: %w[wiki])
49+
create(:valid_project, :with_internal_wiki, identifier: "other-project")
5550
end
5651
shared_let(:user) do
5752
create(:user, member_with_permissions: { project => [:view_wiki_pages],

0 commit comments

Comments
 (0)