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

Merges master and fixes conflicts

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-10-21 22:46:59 +02:00
parent abad54d01a
commit 2bf6603207
19 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/features/verification/letter_spec.rb
View File

@@ -9,9 +9,9 @@ feature 'Verify Letter' do
login_as(user)
visit new_letter_path
click_link "Request a letter"
click_link "Send me a letter with the code"
expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
expect(page).to have_content "Thank you for requesting your maximum security code (only required for the final votes). In a few days we will send it to the address featuring in the data we have on file."
user.reload
@@ -26,7 +26,7 @@ feature 'Verify Letter' do
login_as(user)
visit new_letter_path
expect(page).to have_link "Office of Citizen", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
expect(page).to have_link "Citizen Support Offices", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
end
scenario "Deny access unless verified residence" do
@@ -64,7 +64,7 @@ feature 'Verify Letter' do
fill_in "verification_letter_verification_code", with: user.letter_verification_code
click_button "Verify my account"
expect(page).to have_content "Your account has been verified"
expect(page).to have_content "Code correct. Your account is now verified"
expect(current_path).to eq(account_path)
end
@@ -97,7 +97,7 @@ feature 'Verify Letter' do
fill_in "verification_letter_verification_code", with: user.letter_verification_code
click_button "Verify my account"
expect(page).to have_content "Your account has been verified"
expect(page).to have_content "Code correct. Your account is now verified"
expect(current_path).to eq(account_path)
end
@@ -135,7 +135,7 @@ feature 'Verify Letter' do
click_button "Verify my account"
end
expect(page).to have_content "You have reached the maximum number of verification tries. Please try again later."
expect(page).to have_content "You have reached the maximum number of attempts. Please try again later."
expect(current_path).to eq(account_path)
end

2
spec/features/verification/level_three_verification_spec.rb
View File

@@ -85,6 +85,6 @@ feature 'Level three verification' do
click_link "Send me a letter with the code"
expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
expect(page).to have_content "Thank you for requesting your maximum security code (only required for the final votes). In a few days we will send it to the address featuring in the data we have on file."
end
end

2
spec/features/verification/residence_spec.rb
View File

@@ -29,7 +29,7 @@ feature 'Residence' do
click_button 'Verify residence'
expect(page).to have_content /\d errors? prevented your residence verification/
expect(page).to have_content /\d errors? prevented the verification of your residence/
end
scenario 'Error on postal code not in Madrid census' do