|
+
<%= link_to "#{story.id} - #{story.title}", [story.project, story] %>
-
|
<%= status_label(story) %> |
<%= story.estimate_for(current_user)&.best_case_points %> |
@@ -48,6 +48,10 @@
+
+
+
<%= link_unless_archived(@project, "Edit", edit_project_story_path(@project, story), classes: "edit", icon: 'pencil-square-o') %>
<% if @siblings.any? %>
@@ -65,12 +69,6 @@
<% end %>
<%= link_unless_archived(@project, "Delete", project_story_path(@project.id, story), classes: "delete", icon: 'trash-o', method: :delete, remote: true, data_attr: { confirm: 'Are you sure?', story_id: story.id }) %>
-
- <% link_to new_project_story_path(@project.id, story_id: story.id), class: "clone", title: "Clone" do %>
-
- Clone
- <% end %>
-
<%= link_unless_archived(@project, "Clone", new_project_story_path(@project.id, story_id: story.id), classes: "clone", icon: 'files-o') %>
@@ -105,17 +103,15 @@
<%= link_to 'Return to Projects Page', projects_path, id: :back, class: "button" %>
-
<% if current_user.admin? %>
<%= button_to is_unlocked?(@project) ? 'Lock Project' : 'Unlock Project', toggle_locked_project_path(@project.id), method: :patch, class: "button magenta", id: "lock-btn", remote: true %>
<% end %>
-
<%= link_to 'Clone Project', new_clone_project_path(@project.id), class: "button green" %>
<%= link_to 'Edit Project', edit_project_path(@project.id), class: "button green" %>
<% if is_unlocked?(@project) %>
<%= link_unless_archived(@project, "Add Sub-Project", project_new_sub_project_path(@project), classes: :green) unless @project.parent_id.present? %>
- <%= link_unless_archived(@project, "Delete Project", project_path(@project.id), classes: "delete magenta", method: :delete, remote: true, data_attr: { confirm: 'Are you sure?' }, id: "delete") %>
+ <%= link_unless_archived(@project, "Delete Project", open_delete_modal_project_path(@project.id), classes: "delete magenta", remote: true) %>
<% end %>
<% unless @project.parent_id %>
diff --git a/config/routes.rb b/config/routes.rb
index bffbed7e..c54e79e6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,6 +32,7 @@
patch :toggle_locked
get :new_clone
post :clone
+ get :open_delete_modal
end
get :new_sub_project
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index ffe9b248..ca1a0e4e 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -124,9 +124,35 @@
describe "#destroy" do
it "deletes the project" do
expect {
- delete :destroy, params: {id: project.id}
+ delete :destroy, params: {id: project.id, project: {title: project.title}}
+ }.to change(Project, :count).by(-1)
+ end
+
+ it "deletes stripped project's title" do
+ project.update(title: " foo bar ")
+ expect {
+ delete :destroy, params: {id: project.id, project: {title: "foo bar"}}
+ }.to change(Project, :count).by(-1)
+ end
+
+ it "deletes stripped project's params" do
+ project.update(title: "foo bar")
+ expect {
+ delete :destroy, params: {id: project.id, project: {title: "foo bar "}}
}.to change(Project, :count).by(-1)
end
+
+ it "does not delete the project" do
+ expect {
+ delete :destroy, params: {id: project.id}
+ }.not_to change(Project, :count)
+ end
+
+ it "does not delete the project when the title does not match" do
+ expect {
+ delete :destroy, params: {id: project.id, project: {title: "random title"}}
+ }.not_to change(Project, :count)
+ end
end
describe "#show" do
diff --git a/spec/features/projects_manage_spec.rb b/spec/features/projects_manage_spec.rb
index ac4bb97f..1db8e1c2 100644
--- a/spec/features/projects_manage_spec.rb
+++ b/spec/features/projects_manage_spec.rb
@@ -50,19 +50,27 @@
end
context "when the project is unarchived" do
- it "allows me to delete a project", js: false do
+ it "does not delete a project" do
+ project.update(title: "Awesome Project's Title")
visit project_path(id: project.id)
+
click_link "Delete Project"
- expect(Project.count).to eq 0
+ expect(page).to have_content "Are you absolutely sure?"
+ fill_in "project_title", with: "Random Project's Title"
+ click_button "I understand the consequences, delete this project"
+
+ expect(page).to have_content "Make sure you added the correct project's title"
end
it "allows me to delete a project" do
visit project_path(id: project.id)
- accept_confirm do
- click_link "Delete Project"
- end
- expect(page).not_to have_content "Delete Project"
- expect(Project.count).to eq 0
+
+ click_link "Delete Project"
+ expect(page).to have_content "Are you absolutely sure?"
+ fill_in "project_title", with: project.title
+ click_button "I understand the consequences, delete this project"
+
+ expect(page).to have_content "Project was successfully destroyed."
end
it "allows editing the project's title inline" do
@@ -145,14 +153,6 @@
expect(page.source).to include("php upgrade")
end
- it "allows me to export a CSV" do
- visit project_path(id: project.id)
- find("#import-export").click
-
- click_on "Export"
- expect(page.source).to include("php upgrade")
- end
-
it "allows me to import a CSV" do
visit project_path(id: project.id)
find("#import-export").click