From 52c488a3d7d1cc41b8ad78f604c71493fc68fd4d Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 24 May 2016 21:44:45 -0400 Subject: [PATCH] fixes for tests --- tests/acceptance/settings/account_tests.rb | 8 ++++---- tests/acceptance/signup_tests.rb | 3 ++- tests/fabricators/site_fabricator.rb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/settings/account_tests.rb b/tests/acceptance/settings/account_tests.rb index 087c29fa..0c57be7c 100644 --- a/tests/acceptance/settings/account_tests.rb +++ b/tests/acceptance/settings/account_tests.rb @@ -6,14 +6,14 @@ describe 'site/settings' do before do EmailWorker.jobs.clear - @email = "#{SecureRandom.uuid.gsub('-', '')}@example.com" + @email = "#{SecureRandom.uuid.gsub('-', '')}@exampleedsdfdsf.com" @site = Fabricate :site, email: @email page.set_rack_session id: @site.id visit '/settings' end it 'should change email' do - @new_email = "#{SecureRandom.uuid.gsub('-', '')}@example.com" + @new_email = "#{SecureRandom.uuid.gsub('-', '')}@exampleedsdfdsf.com" fill_in 'email', with: @new_email click_button 'Change Email' @@ -45,7 +45,7 @@ describe 'site/settings' do end it 'should fail for existing email' do - @existing_email = "#{SecureRandom.uuid.gsub('-', '')}@example.com" + @existing_email = "#{SecureRandom.uuid.gsub('-', '')}@exampleedsdfdsf.com" @existing_site = Fabricate :site, email: @existing_email fill_in 'email', with: @existing_email @@ -77,7 +77,7 @@ describe 'site/settings' do include Capybara::DSL before do - @email = "#{SecureRandom.uuid.gsub('-', '')}@example.com" + @email = "#{SecureRandom.uuid.gsub('-', '')}@exampleedsdfdsf.com" @site = Fabricate :site, email: @email EmailWorker.jobs.clear Mail::TestMailer.deliveries.clear diff --git a/tests/acceptance/signup_tests.rb b/tests/acceptance/signup_tests.rb index 69027736..591f60dc 100644 --- a/tests/acceptance/signup_tests.rb +++ b/tests/acceptance/signup_tests.rb @@ -58,7 +58,8 @@ describe 'signup' do page.must_have_content /almost ready!/ fill_in 'token', with: Site[username: @site[:username]].email_confirmation_token click_button 'Confirm Email' - page.must_have_content /Thanks for joining the Neocities community/ + current_path.must_equal '/tutorial' + page.must_have_content /Let's Get Started/ index_file_path = File.join Site::SITE_FILES_ROOT, @site[:username], 'index.html' File.exist?(index_file_path).must_equal true diff --git a/tests/fabricators/site_fabricator.rb b/tests/fabricators/site_fabricator.rb index 9d3dd726..45e613c9 100644 --- a/tests/fabricators/site_fabricator.rb +++ b/tests/fabricators/site_fabricator.rb @@ -1,6 +1,6 @@ Fabricator(:site) do username { SecureRandom.hex } password { 'abcde' } - email { SecureRandom.uuid.gsub('-', '')+'@example.com' } + email { SecureRandom.uuid.gsub('-', '')+'@examplesdlfjdslfj.com' } email_confirmed { true } end