From 59a4b93a007f0ca8210309fea1af07263680467e Mon Sep 17 00:00:00 2001 From: iagirre Date: Wed, 13 Dec 2017 14:03:46 +0100 Subject: [PATCH] Add I18n texts for milestone images. Add specs to test admin image uploader and milestones' show. Modify the UI to fit the mockups provided in the issue. --- app/assets/stylesheets/participation.scss | 3 ++- app/views/budgets/investments/_milestones.html.erb | 2 +- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + spec/features/admin/budget_investment_milestones_spec.rb | 4 ++++ spec/features/budgets/investments_spec.rb | 2 ++ 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 848cd539a..68ba18f15 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -314,7 +314,8 @@ .polls-form, .poll-question-form, .legislation-process-new, -.legislation-process-edit { +.legislation-process-edit, +.milestone-new { @include direct-uploads; } diff --git a/app/views/budgets/investments/_milestones.html.erb b/app/views/budgets/investments/_milestones.html.erb index 5cdabcf2a..0d0c38984 100644 --- a/app/views/budgets/investments/_milestones.html.erb +++ b/app/views/budgets/investments/_milestones.html.erb @@ -15,8 +15,8 @@ <%= t("budgets.investments.show.milestone_publish_date", publish_date: l(milestone.created_at.to_date)) %> + <%= image_tag(milestone.image_url(:large), {alt: milestone.image.title, class: "margin", id: "image_#{milestone.id}"}) if milestone.image.present? %>

<%= milestone.description %>

- <%= image_tag milestone.image_url(:large) if milestone.image.present? %> <% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 3226f531d..13ef24aa5 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -196,6 +196,7 @@ en: table_actions: "Actions" delete: "Delete milestone" no_milestones: "Don't have defined milestones" + image: "Image" show_image: "Show image" new: creating: Create milestone diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 6a052335f..f2090ed1c 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -196,6 +196,7 @@ es: table_actions: "Acciones" delete: "Eliminar hito" no_milestones: "No hay hitos definidos" + image: "Imagen" show_image: "Ver imagen" new: creating: Crear hito diff --git a/spec/features/admin/budget_investment_milestones_spec.rb b/spec/features/admin/budget_investment_milestones_spec.rb index 9bcb78479..7f9e3ff63 100644 --- a/spec/features/admin/budget_investment_milestones_spec.rb +++ b/spec/features/admin/budget_investment_milestones_spec.rb @@ -62,11 +62,14 @@ feature 'Admin budget investment milestones' do context "Edit" do scenario "Change title and description" do milestone = create(:budget_investment_milestone, investment: @investment) + create(:image, imageable: milestone) visit admin_budget_budget_investment_path(@investment.budget, @investment) click_link milestone.title + expect(page).to have_css("img[alt='#{milestone.image.title}']") + fill_in 'budget_investment_milestone_title', with: 'Changed title' fill_in 'budget_investment_milestone_description', with: 'Changed description' @@ -74,6 +77,7 @@ feature 'Admin budget investment milestones' do expect(page).to have_content 'Changed title' expect(page).to have_content 'Changed description' + expect(page).to have_link 'Show image' end end diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index fa7749a4b..9cb1326b1 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -495,6 +495,7 @@ feature 'Budget Investments' do investment = create(:budget_investment) milestone = create(:budget_investment_milestone, investment: investment, title: "New text to show", created_at: DateTime.new(2015, 9, 19).utc) + image = create(:image, imageable: milestone) login_as(user) visit budget_investment_path(budget_id: investment.budget.id, id: investment.id) @@ -505,6 +506,7 @@ feature 'Budget Investments' do expect(page).to have_content(milestone.title) expect(page).to have_content(milestone.description) expect(page).to have_content("Published 2015-09-19") + expect(page.find("#image_#{milestone.id}")['alt']).to have_content image.title end end