Skip to content

Commit d69d02b

Browse files
committed
remove story and task models
1 parent eaebf8c commit d69d02b

10 files changed

Lines changed: 57 additions & 412 deletions

File tree

modules/backlogs/app/models/story.rb

Lines changed: 0 additions & 31 deletions
This file was deleted.

modules/backlogs/app/models/task.rb

Lines changed: 0 additions & 33 deletions
This file was deleted.

modules/backlogs/app/services/stories/create_service.rb

Lines changed: 0 additions & 47 deletions
This file was deleted.

modules/backlogs/app/services/stories/update_service.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
#-- copyright
24
# OpenProject is an open source project management software.
35
# Copyright (C) the OpenProject GmbH

modules/backlogs/lib/open_project/backlogs/mixins/prevent_issue_sti.rb

Lines changed: 0 additions & 45 deletions
This file was deleted.

modules/backlogs/spec/components/backlogs/sprint_header_component_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,27 @@ def render_component(folded: false, active_sprint_ids: nil)
5050
end
5151

5252
describe "show state (default)" do
53-
context "with stories" do
54-
let!(:story1) do
55-
create(:story,
53+
context "with work_packages" do
54+
let!(:work_package1) do
55+
create(:work_package,
5656
project:,
5757
type: type_feature,
5858
status: default_status,
5959
priority: default_priority,
6060
story_points: 5,
6161
sprint:)
6262
end
63-
let!(:story2) do
64-
create(:story,
63+
let!(:work_package2) do
64+
create(:work_package,
6565
project:,
6666
type: type_feature,
6767
status: default_status,
6868
priority: default_priority,
6969
story_points: 3,
7070
sprint:)
7171
end
72-
let!(:story_with_nil_points) do
73-
create(:story,
72+
let!(:work_package_with_nil_points) do
73+
create(:work_package,
7474
project:,
7575
type: type_feature,
7676
status: default_status,
@@ -85,7 +85,7 @@ def render_component(folded: false, active_sprint_ids: nil)
8585
expect(page).to have_css("h3", text: "Sprint 1")
8686
end
8787

88-
it "shows story count via Primer::Beta::Counter" do
88+
it "shows work_package count via Primer::Beta::Counter" do
8989
render_component
9090

9191
expect(page).to have_css(".Counter", text: "3")
@@ -128,7 +128,7 @@ def render_component(folded: false, active_sprint_ids: nil)
128128
context "with no stories" do
129129
let(:stories) { [] }
130130

131-
it "hides the story count counter" do
131+
it "hides the work_package count counter" do
132132
render_component
133133

134134
expect(page).to have_css(".Counter", text: "0", visible: :hidden)

modules/backlogs/spec/features/work_packages/story_points_spec.rb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,18 @@
3838
create(:project,
3939
enabled_module_names: %w(work_package_tracking backlogs))
4040
end
41-
let(:status) { create(:default_status) }
42-
let(:story_type) { create(:type_feature) }
43-
let(:task_type) { create(:type_feature) }
4441

4542
describe "showing the story points on the work package show page" do
4643
let(:story_points) { 42 }
47-
let(:story_with_sp) do
48-
create(:story,
49-
type: story_type,
44+
let(:work_package_with_story_points) do
45+
create(:work_package,
5046
author: current_user,
5147
project:,
52-
status:,
5348
story_points:)
5449
end
5550

5651
it "is displayed" do
57-
wp_page = Pages::FullWorkPackage.new(story_with_sp)
52+
wp_page = Pages::FullWorkPackage.new(work_package_with_story_points)
5853

5954
wp_page.visit!
6055
wp_page.expect_subject

modules/backlogs/spec/models/burndown_spec.rb

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@
2929
require "spec_helper"
3030

3131
RSpec.describe Burndown do
32-
def set_attribute_journalized(story, attribute, value, day)
33-
story.reload
34-
story.send(attribute, value)
35-
story.save!
36-
story.journals[-2].update_columns(validity_period: story.journals[-2].created_at...day) if story.journals.count > 1
37-
story.journals[-1].update_columns(created_at: day, updated_at: day, validity_period: day..Float::INFINITY)
32+
def set_attribute_journalized(work_package, attribute, value, day)
33+
work_package.reload
34+
work_package.send(attribute, value)
35+
work_package.save!
36+
if work_package.journals.many?
37+
work_package.journals[-2].update_columns(validity_period: work_package.journals[-2].created_at...day)
38+
end
39+
work_package.journals[-1].update_columns(created_at: day, updated_at: day, validity_period: day..Float::INFINITY)
3840
end
3941

4042
let(:project) { create(:project) }
@@ -87,29 +89,30 @@ def set_attribute_journalized(story, attribute, value, day)
8789
sprint.save!
8890
end
8991

90-
describe "WITH 1 story assigned to the sprint" do
91-
let(:story) do
92-
build(:story, subject: "Story 1",
93-
project:,
94-
sprint:,
95-
type: type_feature,
96-
status: issue_open,
97-
priority: issue_priority,
98-
created_at: Time.zone.today - 20.days,
99-
updated_at: Time.zone.today - 20.days)
92+
describe "WITH 1 work_package assigned to the sprint" do
93+
let(:work_package) do
94+
build(:work_package,
95+
subject: "WorkPackage 1",
96+
project:,
97+
sprint:,
98+
type: type_feature,
99+
status: issue_open,
100+
priority: issue_priority,
101+
created_at: Time.zone.today - 20.days,
102+
updated_at: Time.zone.today - 20.days)
100103
end
101104

102-
describe "WITH the story having story_point defined on creation" do
105+
describe "WITH the work_package having story_point defined on creation" do
103106
before do
104-
story.story_points = 9
105-
story.save!
106-
story.last_journal.update_columns(created_at: story.created_at, updated_at: story.created_at)
107+
work_package.story_points = 9
108+
work_package.save!
109+
work_package.last_journal.update_columns(created_at: work_package.created_at, updated_at: work_package.created_at)
107110
end
108111

109-
describe "WITH the story being closed and opened again within the sprint duration" do
112+
describe "WITH the work_package being closed and opened again within the sprint duration" do
110113
before do
111-
set_attribute_journalized story, :status_id=, issue_closed.id, 6.days.ago
112-
set_attribute_journalized story, :status_id=, issue_open.id, 3.days.ago
114+
set_attribute_journalized work_package, :status_id=, issue_closed.id, 6.days.ago
115+
set_attribute_journalized work_package, :status_id=, issue_open.id, 3.days.ago
113116
end
114117

115118
it { expect(burndown.story_points).to eql [9.0, 0.0, 0.0, 0.0, 9.0, 9.0] }
@@ -124,14 +127,13 @@ def set_attribute_journalized(story, attribute, value, day)
124127
it { expect(burndown.story_points_ideal).to eql [9.0, 8.0, 7.0, 6.0, 5.0, 4.0, 3.0, 2.0, 1.0, 0.0] }
125128
end
126129

127-
describe "WITH the story marked as resolved and consequently 'done'" do
130+
describe "WITH the work_package marked as resolved and consequently 'done'" do
128131
before do
129-
set_attribute_journalized story, :status_id=, issue_resolved.id, 6.days.ago
130-
set_attribute_journalized story, :status_id=, issue_open.id, 3.days.ago
132+
set_attribute_journalized work_package, :status_id=, issue_resolved.id, 6.days.ago
133+
set_attribute_journalized work_package, :status_id=, issue_open.id, 3.days.ago
131134
project.done_statuses << issue_resolved
132135
end
133136

134-
it { expect(story.done?).to be false }
135137
it { expect(burndown.story_points).to eql [9.0, 0.0, 0.0, 0.0, 9.0, 9.0] }
136138
end
137139
end
@@ -142,14 +144,15 @@ def set_attribute_journalized(story, attribute, value, day)
142144
stories = []
143145

144146
10.times do |i|
145-
stories[i] = create(:story, subject: "Story #{i}",
146-
project:,
147-
sprint:,
148-
type: type_feature,
149-
status: issue_open,
150-
priority: issue_priority,
151-
created_at: Time.zone.today - (20 - i).days,
152-
updated_at: Time.zone.today - (20 - i).days)
147+
stories[i] = create(:work_package,
148+
subject: "WorkPackage #{i}",
149+
project:,
150+
sprint:,
151+
type: type_feature,
152+
status: issue_open,
153+
priority: issue_priority,
154+
created_at: Time.zone.today - (20 - i).days,
155+
updated_at: Time.zone.today - (20 - i).days)
153156
stories[i].last_journal.update_columns(created_at: stories[i].created_at,
154157
updated_at: stories[i].created_at,
155158
validity_period: stories[i].created_at..Float::INFINITY)
@@ -158,14 +161,14 @@ def set_attribute_journalized(story, attribute, value, day)
158161
stories
159162
end
160163

161-
describe "WITH each story having story points defined at start" do
164+
describe "WITH each work_package having story points defined at start" do
162165
before do
163166
stories.each do |s|
164167
set_attribute_journalized s, :story_points=, 10, sprint.start_date - 3.days
165168
end
166169
end
167170

168-
describe "WITH 5 stories having been reduced to 0 story points, one story per day" do
171+
describe "WITH 5 stories having been reduced to 0 story points, one work_package per day" do
169172
before do
170173
5.times do |i|
171174
set_attribute_journalized stories[i], :story_points=, nil, sprint.start_date + i.days + 1.hour
@@ -192,10 +195,10 @@ def set_attribute_journalized(story, attribute, value, day)
192195

193196
context "without dates on the sprint" do
194197
let(:sprint) { create(:sprint, project:, start_date: nil, finish_date: nil) }
195-
let(:story) do
196-
build(:story,
198+
let(:work_package) do
199+
build(:work_package,
197200
:created_in_past,
198-
subject: "Story 1",
201+
subject: "WorkPackage 1",
199202
project:,
200203
sprint:,
201204
type: type_feature,

0 commit comments

Comments
 (0)