- <%= link_to 'Export', export_project_stories_path(@project), class: "button green" %>
+ <%= form_with url: export_project_stories_path(@project), method: :get do |f| %>
+ <%= f.submit "Export", class: "button green", data: { disable_with: false } %>
+
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 7ca962ad..e1500b9b 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -3,7 +3,7 @@
- <%= label_tag 'title_contains', "Filter by title" %>
+ <%= label_tag 'title_contains', "Filter by title or ID" %>
<%= search_field_tag 'title_contains', nil, onkeyup: "filterStories()" %>
@@ -29,7 +29,7 @@
<%= status_label(story) %>
diff --git a/app/views/stories/show.html.erb b/app/views/stories/show.html.erb
index 6e64c761..6027b9ee 100644
--- a/app/views/stories/show.html.erb
+++ b/app/views/stories/show.html.erb
@@ -1,7 +1,7 @@
<%= render "shared/project_title", project: @project %>
- <%= render "shared/story", story: @story %>
+ <%= render partial: "shared/story", locals: { story: @story } %>
<%= link_to 'Back', project_path(@project), id: "back", class: "button" %>
@@ -10,4 +10,16 @@
<%= link_to "Delete", project_story_path(@project.id, @story), method: :delete, data: { confirm: "Are you sure?", story_id: @story.id }, class: "button red", remote: true , title: "Delete" %>
<% end %>
+
+
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 15ce300a..733a014e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,6 +42,7 @@
get :export, on: :collection
resources :estimates, except: [:index, :show]
put :move
+ resources :comments, only: [:create, :edit, :update, :destroy]
end
resource :action_plan, only: [:show]
end
diff --git a/db/migrate/20230908142819_create_comments.rb b/db/migrate/20230908142819_create_comments.rb
new file mode 100644
index 00000000..7f1210e5
--- /dev/null
+++ b/db/migrate/20230908142819_create_comments.rb
@@ -0,0 +1,10 @@
+class CreateComments < ActiveRecord::Migration[7.0]
+ def change
+ create_table :comments do |t|
+ t.text :body
+ t.integer :story_id
+ t.integer :user_id
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5c207f06..7f61a904 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,10 +10,18 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2023_08_31_175732) do
+ActiveRecord::Schema[7.0].define(version: 2023_09_08_142819) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
+ create_table "comments", force: :cascade do |t|
+ t.text "body"
+ t.integer "story_id"
+ t.integer "user_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "estimates", force: :cascade do |t|
t.integer "best_case_points"
t.integer "worst_case_points"
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
new file mode 100644
index 00000000..30fe4c2a
--- /dev/null
+++ b/spec/controllers/comments_controller_spec.rb
@@ -0,0 +1,113 @@
+require "rails_helper"
+
+RSpec.describe CommentsController, type: :controller do
+ render_views
+
+ let!(:user) { FactoryBot.create(:user) }
+ let!(:project) { FactoryBot.create(:project) }
+ let!(:story) { FactoryBot.create(:story, project: project) }
+ let!(:comment) { FactoryBot.create(:comment, story: story, user: user) }
+
+ before do
+ @request.env["devise.mapping"] = Devise.mappings[:user]
+ sign_in user
+ end
+
+ describe "#create" do
+ context "with valid attributes" do
+ let(:valid_params) { FactoryBot.attributes_for(:comment) }
+
+ it "creates a new comment" do
+ expect {
+ post :create, params: {project_id: project.id, story_id: story.id, comment: valid_params}
+ }.to change(Comment, :count).by(1)
+ end
+
+ it "redirects to the story path" do
+ post :create, params: {project_id: project.id, story_id: story.id, comment: valid_params}
+
+ expect(response).to redirect_to project_story_path(project.id, story.id)
+ end
+ end
+
+ context "with invalid attributes" do
+ let(:invalid_params) { {body: ""} }
+
+ it "redirects back to the story page" do
+ post :create, params: {project_id: project.id, story_id: story.id, comment: invalid_params}
+ expect(response).to redirect_to project_story_path(project.id, story.id)
+ end
+ end
+ end
+
+ describe "#destroy" do
+ it "deletes the comment" do
+ delete :destroy, params: {project_id: project.id, story_id: story.id, id: comment.id}
+ expect(Comment.exists?(comment.id)).to be_falsey
+ expect(response).to redirect_to project_story_path(project.id, story.id)
+ end
+
+ it "disallows destroying another users' comment" do
+ user2 = FactoryBot.create(:user)
+ comment2 = FactoryBot.create(:comment, story: story, user: user2)
+
+ delete :destroy, params: {id: comment2.id, story_id: story.id, project_id: project.id}
+
+ expect(response).to redirect_to project_story_path(project.id, story.id)
+ expect(flash[:error]).to eq "Comment not found"
+ end
+ end
+
+ describe "#edit" do
+ before do
+ get :edit, params: {id: comment.id, story_id: story.id, project_id: project.id}
+ end
+
+ it "redirects to the edit page" do
+ expect(response).to render_template :edit
+ end
+
+ it "shows the fields for the comment" do
+ expect(assigns(:comment)).to eq comment
+ end
+ end
+
+ describe "#edit as other user" do
+ it "disallows editing another users' comment" do
+ user2 = FactoryBot.create(:user)
+ comment2 = FactoryBot.create(:comment, story: story, user: user2)
+
+ get :edit, params: {id: comment2.id, story_id: story.id, project_id: project.id}
+
+ expect(response).to redirect_to project_story_path(project.id, story.id)
+ expect(flash[:error]).to eq "Comment not found"
+ end
+ end
+
+ describe "#update" do
+ it "updates the body for the comment" do
+ put :update, params: {
+ id: comment.id,
+ story_id: story.id,
+ project_id: project.id,
+ comment: {
+ body: "test123"
+ }
+ }
+ expect(comment.reload.body).to eq "test123"
+ end
+
+ it "disallows updating another users' comment" do
+ user2 = FactoryBot.create(:user)
+ comment2 = FactoryBot.create(:comment, story: story, user: user2)
+
+ put :update, params: {id: comment2.id,
+ story_id: story.id,
+ project_id: project.id,
+ comment: {body: "test123"}}
+
+ expect(response).to redirect_to project_story_path(project.id, story.id)
+ expect(flash[:error]).to eq "Comment not found"
+ end
+ end
+end
diff --git a/spec/controllers/stories_controller_spec.rb b/spec/controllers/stories_controller_spec.rb
index 4aa5ff6b..8412f837 100644
--- a/spec/controllers/stories_controller_spec.rb
+++ b/spec/controllers/stories_controller_spec.rb
@@ -171,5 +171,47 @@
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}
+ expect(response).to have_http_status(:ok)
+
+ csv_data = CSV.parse(response.body)
+ expected_csv_content = [
+ ["id", "title", "description", "position"],
+ [story.id.to_s, story.title, story.description, story.position.to_s]
+ ]
+ expect(csv_data).to eq(expected_csv_content)
+ end
+
+ context "with comments" do
+ it "exports a CSV file" do
+ user = FactoryBot.create(:user)
+ story2 = FactoryBot.create(:story, project: project)
+ story3 = FactoryBot.create(:story, project: project)
+ story4 = FactoryBot.create(:story, project: project)
+ comment1 = FactoryBot.create(:comment, user: user, story: story)
+ comment1_2 = FactoryBot.create(:comment, user: user, story: story)
+ comment2_1 = FactoryBot.create(:comment, user: user, story: story2)
+ comment2_2 = FactoryBot.create(:comment, user: user, story: story2)
+ comment3_1 = FactoryBot.create(:comment, user: user, story: story3)
+ get :export, params: {project_id: project.id, export_with_comments: "1"}
+
+ expect(response).to have_http_status(:ok)
+
+ csv_data = CSV.parse(response.body)
+ expected_csv_content = [
+ ["id", "title", "description", "position", "comment"],
+ [story.id.to_s, story.title, story.description, story.position.to_s, "#{comment1.user.name}: #{comment1.body}", "#{comment1_2.user.name}: #{comment1_2.body}"],
+ [story2.id.to_s, story2.title, story2.description, story2.position.to_s, "#{comment2_1.user.name}: #{comment2_1.body}", "#{comment2_2.user.name}: #{comment2_2.body}"],
+ [story3.id.to_s, story3.title, story3.description, story3.position.to_s, "#{comment3_1.user.name}: #{comment3_1.body}"],
+ [story4.id.to_s, story4.title, story4.description, story4.position.to_s]
+ ]
+
+ expect(csv_data).to eq(expected_csv_content)
+ end
+ end
+ end
end
end
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
new file mode 100644
index 00000000..39556e6c
--- /dev/null
+++ b/spec/factories/comments.rb
@@ -0,0 +1,7 @@
+FactoryBot.define do
+ factory :comment do
+ body { Faker::ChuckNorris.fact }
+ user
+ story
+ end
+end
diff --git a/spec/features/stories_manage_spec.rb b/spec/features/stories_manage_spec.rb
index 6a327295..a5e1a783 100644
--- a/spec/features/stories_manage_spec.rb
+++ b/spec/features/stories_manage_spec.rb
@@ -318,4 +318,25 @@
expect(page).not_to have_selector(".project-table.sorting")
end
+
+ it "filter stories by title or ID", js: true do
+ story4 = FactoryBot.create(:story, project: project, title: "Deprecation warning XYZ")
+ story5 = FactoryBot.create(:story, project: project, title: "Dangerous query method")
+
+ visit project_path(id: project.id)
+
+ fill_in "title_contains", with: "XYZ"
+
+ within("#stories") do
+ expect(find("td:nth-child(1)")).to have_text story4.title
+ expect(all("#stories > tr").count).to eq(1)
+ end
+
+ fill_in "title_contains", with: story5.id
+
+ within("#stories") do
+ expect(find("td:nth-child(1)")).to have_text story5.title
+ expect(all("#stories > tr").count).to eq(1)
+ end
+ end
end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
new file mode 100644
index 00000000..edb0da0f
--- /dev/null
+++ b/spec/models/comment_spec.rb
@@ -0,0 +1,9 @@
+require "rails_helper"
+
+RSpec.describe Comment, type: :model do
+ subject { FactoryBot.create(:comment) }
+
+ it { should belong_to(:user) }
+ it { should belong_to(:story) }
+ it { should validate_presence_of(:body) }
+end
<%= comment.user.name %>: <%= markdown(comment.body) %> <%= comment.created_at %>
+ <% if current_user == comment.user %> + <%= link_to "Edit Comment", edit_project_story_comment_path(project, story, comment), class: "link-blue" %> | + <%= link_to "Delete", project_story_comment_path(project, story, comment), method: :delete, data: { confirm: "Are you sure?" }, title: "Delete" %> + <% end %> +