Merge branch 'master' into aperez-dates-for-milestones

This commit is contained in:
Alberto García
2017-12-14 20:50:55 +01:00
committed by GitHub
10 changed files with 51 additions and 3 deletions

View File

@@ -12,6 +12,8 @@ feature 'Admin budget investment milestones' do
context "Index" do
scenario 'Displaying milestones' do
milestone = create(:budget_investment_milestone, investment: @investment)
create(:image, imageable: milestone)
document = create(:document, documentable: milestone)
visit admin_budget_budget_investment_path(@investment.budget, @investment)
@@ -19,6 +21,8 @@ feature 'Admin budget investment milestones' do
expect(page).to have_content(milestone.title)
expect(page).to have_content(milestone.id)
expect(page).to have_content(milestone.publication_date.to_date)
expect(page).to have_link 'Show image'
expect(page).to have_link document.title
end
scenario 'Displaying no_milestones text' do
@@ -63,11 +67,13 @@ feature 'Admin budget investment milestones' do
end
context "Edit" do
scenario "Change title and description" do
scenario "Change title, description and document names" do
milestone = create(:budget_investment_milestone, investment: @investment)
create(:image, imageable: milestone)
document = create(:document, documentable: milestone)
visit admin_budget_budget_investment_path(@investment.budget, @investment)
expect(page).to have_link document.title
click_link milestone.title
@@ -76,6 +82,7 @@ feature 'Admin budget investment milestones' do
fill_in 'budget_investment_milestone_title', with: 'Changed title'
fill_in 'budget_investment_milestone_description', with: 'Changed description'
fill_in 'budget_investment_milestone_publication_date', with: Time.zone.today.to_date
fill_in 'budget_investment_milestone_documents_attributes_0_title', with: 'New document title'
click_button 'Update milestone'
@@ -83,6 +90,7 @@ feature 'Admin budget investment milestones' do
expect(page).to have_content 'Changed description'
expect(page).to have_content Time.zone.today.to_date
expect(page).to have_link 'Show image'
expect(page).to have_link 'New document title'
end
end

View File

@@ -503,6 +503,7 @@ feature 'Budget Investments' do
investment = create(:budget_investment)
milestone = create(:budget_investment_milestone, investment: investment, title: "New text to show")
image = create(:image, imageable: milestone)
document = create(:document, documentable: milestone)
login_as(user)
visit budget_investment_path(budget_id: investment.budget.id, id: investment.id)
@@ -514,6 +515,7 @@ feature 'Budget Investments' do
expect(page).to have_content(milestone.description)
expect(page).to have_content(Time.zone.today.to_date)
expect(page.find("#image_#{milestone.id}")['alt']).to have_content image.title
expect(page).to have_link document.title
end
end