From 4100bf2ddf001cedca987ac693910f99066ec1f6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 11 Apr 2019 18:55:15 +0200 Subject: [PATCH] Update dashboard specs --- config/locales/en/images.yml | 3 +-- config/locales/es/images.yml | 2 +- db/schema.rb | 4 ++-- spec/features/dashboard/dashboard_spec.rb | 24 ++++++++++------------- spec/features/proposals_spec.rb | 4 ++-- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/config/locales/en/images.yml b/config/locales/en/images.yml index 63132647d..14ca43c2d 100644 --- a/config/locales/en/images.yml +++ b/config/locales/en/images.yml @@ -15,8 +15,7 @@ en: destroy: notice: Image was deleted successfully. alert: Cannot destroy image. - confirm: Are you sure you want to delete the image? This action cannot be undone! errors: messages: in_between: must be in between %{min} and %{max} - wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} \ No newline at end of file + wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} diff --git a/config/locales/es/images.yml b/config/locales/es/images.yml index d7c4c6580..c4910ee78 100644 --- a/config/locales/es/images.yml +++ b/config/locales/es/images.yml @@ -8,13 +8,13 @@ es: delete_button: Eliminar imagen note: "Puedes subir una imagen en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo." add_new_image: Añadir imagen + title_placeholder: Añade un título descriptivo para la imagen admin_title: "Imagen" admin_alt_text: "Texto alternativo para la imagen" actions: destroy: notice: La imagen se ha eliminado correctamente. alert: La imagen no se ha podido eliminar. - confirm: "¿Está seguro de que desea eliminar la imagen? Esta acción no se puede deshacer!" errors: messages: in_between: debe estar entre %{min} y %{max} diff --git a/db/schema.rb b/db/schema.rb index bad21eac1..780a0cea6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -806,8 +806,8 @@ ActiveRecord::Schema.define(version: 20190411090023) do t.string "url" t.string "linkable_type" t.integer "linkable_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["linkable_type", "linkable_id"], name: "index_links_on_linkable_type_and_linkable_id", using: :btree end diff --git a/spec/features/dashboard/dashboard_spec.rb b/spec/features/dashboard/dashboard_spec.rb index f02294082..679b6c87a 100644 --- a/spec/features/dashboard/dashboard_spec.rb +++ b/spec/features/dashboard/dashboard_spec.rb @@ -9,7 +9,7 @@ feature "Proposal's dashboard" do end scenario "Dashboard has a link to my proposal" do - expect(page).to have_link("My proposal") + expect(page).to have_link("Edit my proposal") end scenario "My proposal has a link to edit the proposal" do @@ -110,13 +110,6 @@ feature "Proposal's dashboard" do end end - scenario "Dashboard progress display contains no results text when there are not - proposed_actions pending" do - visit progress_proposal_dashboard_path(proposal) - - expect(page).to have_content("No recommended actions pending") - end - scenario "Dashboard progress display proposed_action done on his section" do action = create(:dashboard_action, :proposed_action, :active) @@ -326,11 +319,14 @@ feature "Proposal's dashboard" do expect(page).to have_link("Access the community") end - scenario "Dashboard has a link to recommended_actions", js: true do - expect(page).to have_link("Recommended actions") - click_link "Recommended actions" + scenario "Dashboard has a link to recommended_actions if there is any", js: true do + expect(page).not_to have_link("Recommended actions") - expect(page).to have_content("Recommended actions") + create_list(:dashboard_action, 3, :proposed_action, :active) + visit recommended_actions_proposal_dashboard_path(proposal.to_param) + + expect(page).to have_link("Recommended actions") + expect(page).to have_selector("h2", text: "Recommended actions") expect(page).to have_content("Pending") expect(page).to have_content("Done") end @@ -401,10 +397,10 @@ feature "Proposal's dashboard" do end end - scenario "No recommended actions done" do + scenario "No recommended actions pending or done" do visit progress_proposal_dashboard_path(proposal) - expect(page).to have_content("No recommended actions done") + expect(page).not_to have_content("Recommended actions") end describe "detect_new_actions_after_last_login" do diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 3373db418..a54884e4d 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -423,7 +423,7 @@ feature "Proposals" do click_link "Dashboard" within "#side_menu" do - click_link "My proposal" + click_link "Edit my proposal" end click_link "Edit proposal" @@ -503,7 +503,7 @@ feature "Proposals" do end within "#side_menu" do - click_link "My proposal" + click_link "Edit my proposal" end click_link "Retire proposal"