<%= f.submit yield(:button_text), class: "button green", id: "edit" %>
diff --git a/config/routes.rb b/config/routes.rb
index b1565639..c54e79e6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,9 +11,17 @@
get "home/index"
get "reports/index"
- resource :stories do
- post :bulk_destroy, to: "stories#bulk_destroy"
- post :render_markdown
+ resources :stories do
+ member do
+ patch :approve
+ patch :reject
+ patch :pending
+ end
+
+ collection do
+ post :bulk_destroy, to: "stories#bulk_destroy"
+ post :render_markdown
+ end
end
resources :projects do
diff --git a/db/migrate/20230829001347_add_status_to_stories.rb b/db/migrate/20230829001347_add_status_to_stories.rb
new file mode 100644
index 00000000..39acb5fc
--- /dev/null
+++ b/db/migrate/20230829001347_add_status_to_stories.rb
@@ -0,0 +1,5 @@
+class AddStatusToStories < ActiveRecord::Migration[7.0]
+ def change
+ add_column :stories, :status, :integer, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7e88c118..7f61a904 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -52,6 +52,7 @@
t.integer "position"
t.integer "real_score"
t.string "extra_info"
+ t.integer "status", default: 0
end
create_table "users", force: :cascade do |t|
diff --git a/spec/controllers/stories_controller_spec.rb b/spec/controllers/stories_controller_spec.rb
index d9eb729b..8412f837 100644
--- a/spec/controllers/stories_controller_spec.rb
+++ b/spec/controllers/stories_controller_spec.rb
@@ -145,6 +145,33 @@
end
end
+ describe "#approve" do
+ it "updates the story status to approved" do
+ patch :approve, params: {id: story.id}, format: :js
+
+ expect(story.reload.status).to eq("approved")
+ expect(response).to render_template("shared/update_status")
+ end
+ end
+
+ describe "#reject" do
+ it "updates the story status to rejected" do
+ patch :reject, params: {id: story.id}, format: :js
+
+ expect(story.reload.status).to eq("rejected")
+ expect(response).to render_template("shared/update_status")
+ end
+ end
+
+ describe "#pending" do
+ it "updates the story status to pending" do
+ patch :pending, params: {id: story.id}, format: :js
+
+ expect(story.reload.status).to eq("pending")
+ expect(response).to render_template("shared/update_status")
+ end
+ end
+
describe "#export" do
it "exports a CSV file" do
get :export, params: {project_id: project.id}
diff --git a/spec/features/stories_manage_spec.rb b/spec/features/stories_manage_spec.rb
index a5e1a783..5048201f 100644
--- a/spec/features/stories_manage_spec.rb
+++ b/spec/features/stories_manage_spec.rb
@@ -15,8 +15,36 @@
fill_in "story[title]", with: "As a user, I want to add stories"
fill_in "story[description]", with: "This story allows users to add stories."
fill_in "story[extra_info]", with: "This story allows users to add extra details."
+ default_status = find(:option, "Pending")
+ expect(default_status).to be_selected
click_button "Create"
expect(Story.count).to eq 2
+
+ story = Story.last
+ expect(story.pending?).to be true
+ end
+
+ context "within the new story page" do
+ it "allows me to select a status other than pending" do
+ visit project_path(id: project.id)
+ click_link "Add a Story"
+ fill_in "story[title]", with: "As a user, I want to add stories"
+ fill_in "story[description]", with: "This story allows users to add stories."
+ fill_in "story[extra_info]", with: "This story allows users to add extra details."
+ select "Approved", from: "Status"
+ status = find(:option, "Approved")
+ expect(status).to be_selected
+ click_button "Create"
+
+ story = Story.last
+ expect(story.approved?).to be true
+ end
+
+ it "doesn't have a Rejected option for the status" do
+ visit project_path(id: project.id)
+ click_link "Add a Story"
+ expect { find(:option, "Rejected") }.to raise_error(Capybara::ElementNotFound)
+ end
end
it "allows me to clone a story" do
diff --git a/spec/features/story_show_spec.rb b/spec/features/story_show_spec.rb
new file mode 100644
index 00000000..45679cf8
--- /dev/null
+++ b/spec/features/story_show_spec.rb
@@ -0,0 +1,47 @@
+require "rails_helper"
+
+RSpec.describe "story status", js: true do
+ let(:user) { FactoryBot.create(:user) }
+ let(:project) { FactoryBot.create(:project) }
+ let!(:story) { FactoryBot.create(:story, project: project) }
+
+ before do
+ login_as(user, scope: :user)
+ end
+
+ context "from the show page" do
+ it "allows me to change the story status" do
+ visit project_story_path(project_id: project.id, id: story.id)
+
+ status_button = find(".dropdown-wrapper").find("button")
+
+ status_button.click
+ click_button("Approve")
+
+ status_button = find(".dropdown-wrapper").find("button")
+
+ expect(status_button).to have_text("approved")
+ end
+ end
+
+ context "from the estimation modal" do
+ it "allows me to change the story status" do
+ visit project_path(id: project.id)
+ click_link "Add Estimate"
+
+ status_button = find(".story-title").find(".dropdown-wrapper").find("button")
+
+ status_button.click
+ click_button("Approve")
+
+ status_button = find(".story-title").find(".dropdown-wrapper").find("button")
+
+ expect(status_button).to have_text("approved")
+
+ click_button "Save changes"
+
+ status_badge = find(".project-table").find(".status").find(".story-status-badge")
+ expect(status_badge).to have_text("approved")
+ end
+ end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c58adc97..7accd23a 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -63,8 +63,8 @@ def expect_closed_modal
def expect_story_estimates(story, best, worst)
within_story_row(story) do
- expect(find("td:nth-child(2)")).to have_text best.to_s
- expect(find("td:nth-child(3)")).to have_text worst.to_s
+ expect(find("td:nth-child(3)")).to have_text best.to_s
+ expect(find("td:nth-child(4)")).to have_text worst.to_s
end
end
end