consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes suggested in PR:

Browse Source 
* Delete all things related to banner images and styles (in code)
* Add a new test to check that the banner is showing correctly
* Update the specs accordingly to match the changes

Update dev_seed to set a random background_color and a font_color for banners (and remove everything about image and style)
Add a rake task to migrate the banner style to backgroun_color and font_color (so that the banners have the same colors than before)
This commit is contained in:
iagirre
2018-01-24 16:23:12 +01:00
committed by Angel Perez
parent 5d1b06a3cb
commit 82cb8d4c52
8 changed files with 75 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
spec/features/admin/banners_spec.rb
View File

@@ -11,42 +11,42 @@ feature 'Admin banners magement' do
@banner1 = create(:banner, title: "Banner number one",
description: "This is the text of banner number one and is not active yet",
target_url: "http://www.url.com",
style: "banner-style.banner-one",
image: "banner-img.banner-one",
post_started_at: (Time.current + 4.days),
post_ended_at: (Time.current + 10.days))
post_ended_at: (Time.current + 10.days),
background_color: '#FF0000',
font_color: '#FFFFFF')
@banner2 = create(:banner, title: "Banner number two",
description: "This is the text of banner number two and is not longer active",
target_url: "http://www.url.com",
style: "banner-style.banner-two",
image: "banner-img.banner-two",
post_started_at: (Time.current - 10.days),
post_ended_at: (Time.current - 3.days))
post_ended_at: (Time.current - 3.days),
background_color: '#00FF00',
font_color: '#FFFFFF')
@banner3 = create(:banner, title: "Banner number three",
description: "This is the text of banner number three and has style banner-three",
target_url: "http://www.url.com",
style: "banner-style.banner-three",
image: "banner-img.banner-three",
post_started_at: (Time.current - 1.day),
post_ended_at: (Time.current + 10.days))
post_ended_at: (Time.current + 10.days),
background_color: '#0000FF',
font_color: '#FFFFFF')
@banner4 = create(:banner, title: "Banner number four",
description: "This is the text of banner number four and has style banner-one",
target_url: "http://www.url.com",
style: "banner-style.banner-one",
image: "banner-img.banner-one",
post_started_at: (DateTime.current - 10.days),
post_ended_at: (DateTime.current + 10.days))
post_ended_at: (DateTime.current + 10.days),
background_color: '#FFF000',
font_color: '#FFFFFF')
@banner5 = create(:banner, title: "Banner number five",
description: "This is the text of banner number five and has style banner-two",
target_url: "http://www.url.com",
style: "banner-style.banner-one",
image: "banner-img.banner-one",
post_started_at: (DateTime.current - 10.days),
post_ended_at: (DateTime.current + 10.days))
post_ended_at: (DateTime.current + 10.days),
background_color: '#FFFF00',
font_color: '#FFFFFF')
end
scenario 'Index show active banners' do
@@ -112,14 +112,27 @@ feature 'Admin banners magement' do
expect(page.find_field("banner_font_color_picker").value).to eq('#ffb2b2')
end
scenario "Created banner is correctly shown in the web" do
banner = create(:banner, title: 'My banner', description: 'My description of the banner', target_url: '/debates', background_color: '#00FF00')
visit proposals_path
expect(find('.banner')[:style]).to eq("background-color:#00FF00")
within('.banner') do
expect(find('h2')[:style]).to eq("color:#{banner.font_color}")
expect(find('h3')[:style]).to eq("color:#{banner.font_color}")
end
end
scenario 'Edit banner with live refresh', :js do
banner1 = create(:banner, title: 'Hello',
description: 'Wrong text',
target_url: 'http://www.url.com',
style: 'banner-style.banner-one',
image: 'banner-img.banner-one',
post_started_at: (Time.current + 4.days),
post_ended_at: (Time.current + 10.days))
post_ended_at: (Time.current + 10.days),
background_color: '#FF0000',
font_color: '#FFFFFF')
visit admin_root_path
@@ -135,7 +148,7 @@ feature 'Admin banners magement' do
select 'Banner style 1', from: 'banner_style'
select 'Banner image 2', from: 'banner_image'
within('div#js-banner-style') do
within('div#js-banner-background') do
expect(page).to have_selector('h2', text: 'Modified title')
expect(page).to have_selector('h3', text: 'Edited text')
end
@@ -154,10 +167,10 @@ feature 'Admin banners magement' do
create(:banner, title: 'Ugly banner',
description: 'Bad text',
target_url: 'http://www.url.com',
style: 'banner-style.banner-one',
image: 'banner-img.banner-one',
post_started_at: (Time.current + 4.days),
post_ended_at: (Time.current + 10.days))
post_ended_at: (Time.current + 10.days),
background_color: '#FF0000',
font_color: '#FFFFFF')
visit admin_root_path