zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'v2' of github.com:neocities/neocities into v2

Browse source
This commit is contained in:
Victoria Wang 2014-04-23 16:11:41 -07:00
commit c6113c951b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/acceptance_tests.rb
View file

@ -12,7 +12,7 @@ describe 'index' do
it 'goes to signup' do
visit '/'
click_button 'Create My Website'
page.must_have_content('Create a New Home Page')
page.must_have_content('Create a New Website')
end
end
@ -109,9 +109,9 @@ describe 'signin' do
it 'fails for invalid login' do
visit '/'
click_link 'Sign In'
page.must_have_content 'Welcome back'
page.must_have_content 'Welcome Back'
fill_in_valid
click_button 'Sign in'
click_button 'Sign In'
page.must_have_content 'Invalid login'
end
@ -121,7 +121,7 @@ describe 'signin' do
auth = {username: SecureRandom.hex, password: Faker::Internet.password}
fill_in 'username', with: auth[:username]
fill_in 'password', with: auth[:password]
click_button 'Sign in'
click_button 'Sign In'
page.must_have_content 'Invalid login'
end
@ -137,7 +137,7 @@ describe 'signin' do
click_link 'Sign In'
fill_in 'username', with: site[:username]
fill_in 'password', with: site[:password]
click_button 'Sign in'
click_button 'Sign In'
page.must_have_content 'My Website'
end
end

4
views/new.erb
View file

@ -5,8 +5,8 @@
<div class="header-Outro">
<div class="row content single-Col">
<h1>Create a New Web Page</h1>
<h3 class="subtitle">Your free web page is only a few minutes away!</h3>
<h1>Create a New Website</h1>
<h3 class="subtitle">Your free web site is only a few minutes away!</h3>
</div>
</div>