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 kyledrake changes

Browse source
This commit is contained in:
Victoria Wang 2014-10-27 18:15:39 -07:00
commit 6d3a6aa9e0
7 changed files with 107 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app.rb
View file

@ -256,8 +256,13 @@ get '/?' do
end
def generate_question
question_first_number = rand 5
question_last_number = rand 5
if ENV['RACK_ENV'] == 'test'
question_first_number = 1
question_last_number = 1
else
question_first_number = rand 5
question_last_number = rand 5
end
session[:question_answer] = (question_first_number + question_last_number).to_s
[question_first_number, question_last_number]
end
@ -304,7 +309,7 @@ post '/plan/update' do
reply_to: 'contact@neocities.org',
to: current_site.email || parent_site.email,
subject: "[Neocities] You've become a supporter!",
body: Tilt.new('./views/templates/email_subscription.erb', pretty: true).render(self, plan_name: Site::PLAN_FEATURES[params[:plan_type].to_sym][:name])
body: Tilt.new('./views/templates/email_subscription.erb', pretty: true).render(self, plan_name: Site::PLAN_FEATURES[params[:plan_type].to_sym][:name], plan_space: Site::PLAN_FEATURES[params[:plan_type].to_sym][:space].to_space_pretty)
})
end

11
tests/acceptance/index_tests.rb
View file

@ -1,11 +0,0 @@
require_relative './environment.rb'
describe 'index' do
include Capybara::DSL
it 'goes to signup' do
Capybara.reset_sessions!
visit '/'
click_button 'Create My Site'
page.must_have_content('Create a New Website')
end
end

21
tests/acceptance/settings/site_tests.rb
View file

@ -201,28 +201,13 @@ describe 'site/settings' do
describe 'change username' do
include Capybara::DSL
def visit_signup
visit '/'
click_button 'Create My Site'
end
def fill_in_valid
@site = Fabricate.attributes_for(:site)
fill_in 'username', with: @site[:username]
fill_in 'password', with: @site[:password]
fill_in 'email', with: @site[:email]
end
before do
Capybara.reset_sessions!
visit_signup
@site = Fabricate :site
page.set_rack_session id: @site.id
end
it 'does not allow bad usernames' do
visit '/'
click_button 'Create My Site'
fill_in_valid
click_button 'Create Home Page'
visit "/settings/#{@site[:username]}#username"
fill_in 'name', with: ''
click_button 'Change Name'
@ -233,7 +218,7 @@ describe 'site/settings' do
## TODO fix this without screwing up legacy sites
#fill_in 'name', with: '-'
#click_button 'Change Name'
page.must_have_content /valid.+name.+required/i
page.must_have_content /Usernames can only contain/i
Site[username: @site[:username]].wont_equal nil
Site[username: ''].must_equal nil
end

22
tests/acceptance/signin_tests.rb
View file

@ -38,29 +38,23 @@ describe 'signin' do
end
it 'signs in with proper credentials' do
visit '/'
click_button 'Create My Site'
fill_in_valid_signup
click_button 'Create Home Page'
Capybara.reset_sessions!
pass = SecureRandom.hex
@site = Fabricate :site, password: pass
visit '/'
click_link 'Sign In'
fill_in 'username', with: @site[:username]
fill_in 'password', with: @site[:password]
fill_in 'username', with: @site.username
fill_in 'password', with: pass
click_button 'Sign In'
page.must_have_content 'Your Feed'
end
it 'signs in with email' do
visit '/'
click_button 'Create My Site'
fill_in_valid_signup
click_button 'Create Home Page'
Capybara.reset_sessions!
pass = SecureRandom.hex
@site = Fabricate :site, password: pass
visit '/'
click_link 'Sign In'
fill_in 'username', with: @site[:email]
fill_in 'password', with: @site[:password]
fill_in 'username', with: @site.email
fill_in 'password', with: pass
click_button 'Sign In'
page.must_have_content 'Your Feed'
end

157
tests/acceptance/signup_tests.rb
View file

@ -8,22 +8,36 @@ describe 'signup' do
fill_in 'username', with: @site[:username]
fill_in 'password', with: @site[:password]
fill_in 'email', with: @site[:email]
fill_in 'question_answer', with: 2
end
def click_signup_button
click_button 'Create My Site'
end
def site_created?
page.must_have_content 'Your Feed'
end
def visit_signup
visit '/'
click_button 'Create My Site'
end
before do
Capybara.default_driver = :poltergeist
Capybara.reset_sessions!
visit_signup
end
after do
Capybara.default_driver = :rack_test
end
it 'succeeds with valid data' do
Capybara.default_driver = :poltergeist
fill_in_valid
click_button 'Create Home Page'
page.must_have_content 'Your Feed'
click_signup_button
site_created?.must_equal true
assert_equal(
true,
File.exist?(File.join(Site::SITE_FILES_ROOT, @site[:username], 'index.html'))
@ -32,130 +46,133 @@ describe 'signup' do
it 'fails to create for existing site' do
fill_in_valid
click_button 'Create Home Page'
click_signup_button
page.must_have_content 'Your Feed'
Capybara.reset_sessions!
visit_signup
fill_in 'username', with: @site[:username]
fill_in 'password', with: @site[:password]
click_button 'Create Home Page'
click_signup_button
page.must_have_content 'already taken'
end
it 'fails with missing password' do
fill_in_valid
fill_in 'password', with: ''
click_button 'Create Home Page'
click_signup_button
page.must_have_content 'Password must be at least 5 characters'
end
it 'fails with short password' do
fill_in_valid
fill_in 'password', with: 'derp'
click_button 'Create Home Page'
click_signup_button
page.must_have_content 'Password must be at least 5 characters'
end
it 'fails with invalid hostname for username' do
fill_in_valid
fill_in 'username', with: '|\|0p|E'
click_button 'Create Home Page'
page.current_path.must_equal '/create'
page.must_have_content 'A valid user/site name is required'
click_signup_button
page.must_have_content 'Usernames can only contain'
fill_in 'username', with: 'nope-'
click_button 'Create Home Page'
click_signup_button
page.must_have_content 'A valid user/site name is required'
fill_in 'username', with: '-nope'
click_button 'Create Home Page'
click_signup_button
page.must_have_content 'A valid user/site name is required'
end
it 'fails with username greater than 32 characters' do
fill_in_valid
fill_in 'username', with: SecureRandom.hex+'1'
click_button 'Create Home Page'
click_signup_button
page.must_have_content 'cannot exceed 32 characters'
end
it 'fails with invalid tag chars' do
fill_in_valid
fill_in 'tags', with: '$POLICE OFFICER$$$$$, derp'
click_button 'Create Home Page'
page.must_have_content /Tag.+can only contain/
end
it 'fails for tag with too many spaces' do
fill_in_valid
fill_in 'tags', with: 'police officer, hi'
click_button 'Create Home Page'
page.must_have_content /Tag.+cannot have spaces/
end
it 'fails for tag with too many words' do
fill_in_valid
fill_in 'tags', with: 'police officer'
click_button 'Create Home Page'
page.must_have_content /Tag.+cannot be more than #{Tag::NAME_WORDS_MAX} word/
end
it "fails for tag longer than #{Tag::NAME_LENGTH_MAX} characters" do
fill_in_valid
fill_in 'tags', with: SecureRandom.hex(Tag::NAME_LENGTH_MAX)
click_button 'Create Home Page'
page.must_have_content /cannot be longer than #{Tag::NAME_LENGTH_MAX}/
end
it 'fails for too many tags' do
fill_in_valid
fill_in 'tags', with: 'one, two, three, four, five, six'
click_button 'Create Home Page'
page.must_have_content /Cannot have more than \d tags for your site/
end
it 'does not duplicate tags' do
fill_in_valid
fill_in 'tags', with: 'one, one'
click_button 'Create Home Page'
site = Site.last
site.tags.length.must_equal 1
site.tags.first.name.must_equal 'one'
end
it 'fails with existing email' do
email = Fabricate.attributes_for(:site)[:email]
fill_in_valid
fill_in 'email', with: email
click_button 'Create Home Page'
page.must_have_content 'Your Feed'
click_signup_button
site_created?.must_equal true
Capybara.reset_sessions!
visit_signup
fill_in_valid
fill_in 'email', with: email
click_button 'Create Home Page'
click_signup_button
page.must_have_content /email.+exists/
end
puts "$$$$$$$$$$$$$$$$$$$$$$ TODO FIX TAGS TESTS"
=begin
it 'succeeds with no tags' do
fill_in_valid
fill_in 'tags', with: ''
click_button 'Create Home Page'
page.must_have_content 'Your Feed'
fill_in 'new_tags_string', with: ''
click_signup_button
site_created?.must_equal true
end
it 'succeeds with a single tag' do
fill_in_valid
fill_in 'tags', with: 'derpie'
click_button 'Create Home Page'
page.must_have_content 'Your Feed'
fill_in 'new_tags_string', with: 'derpie'
click_signup_button
site_created?.must_equal true
Site.last.tags.first.name.must_equal 'derpie'
end
it 'succeeds with valid tags' do
fill_in_valid
fill_in 'tags', with: 'derpie, shoujo'
click_button 'Create Home Page'
page.must_have_content 'Your Feed'
fill_in 'new_tags_string', with: 'derpie, shoujo'
click_signup_button
site_created?.must_equal true
Site.last.tags.collect {|t| t.name}.must_equal ['derpie', 'shoujo']
end
it 'fails with invalid tag chars' do
fill_in_valid
fill_in 'new_tags_string', with: '$POLICE OFFICER$$$$$, derp'
click_signup_button
page.must_have_content /Tag.+can only contain/
end
it 'fails for tag with too many spaces' do
fill_in_valid
fill_in 'new_tags_string', with: 'police officer, hi'
click_signup_button
page.must_have_content /Tag.+cannot have spaces/
end
it 'fails for tag with too many words' do
fill_in_valid
fill_in 'new_tags_string', with: 'police officer'
click_signup_button
page.must_have_content /Tag.+cannot be more than #{Tag::NAME_WORDS_MAX} word/
end
it "fails for tag longer than #{Tag::NAME_LENGTH_MAX} characters" do
fill_in_valid
fill_in 'new_tags_string', with: SecureRandom.hex(Tag::NAME_LENGTH_MAX)
click_signup_button
page.must_have_content /cannot be longer than #{Tag::NAME_LENGTH_MAX}/
end
it 'fails for too many tags' do
fill_in_valid
fill_in 'new_tags_string', with: 'one, two, three, four, five, six'
click_signup_button
page.must_have_content /Cannot have more than \d tags for your site/
end
it 'does not duplicate tags' do
fill_in_valid
fill_in 'new_tags_string', with: 'one, one'
click_signup_button
site = Site.last
site.tags.length.must_equal 1
site.tags.first.name.must_equal 'one'
end
=end
end

1
views/_news.erb
View file

@ -50,7 +50,6 @@
<a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= event_site.title.shorten(45) %></a> has been updated.
<% end %>
<span class="date">
<% binding.pry %>
<a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
</span>
</div>

2
views/templates/email_subscription.erb
View file

@ -1,6 +1,6 @@
Hi there!
We just wanted to email you to confirm your supporter upgrade! You are on the <%= plan_name %> support tier. You now have <%= Site::SUPPORTER_MAXIMUM.to_space_pretty %> of space (and we're likely to upgrade this even more soon). We're looking forward to seeing the awesome things you will do with it.
We just wanted to email you to confirm your supporter upgrade! You are on the <%= plan_name %> support tier. You now have <%= plan_space %> of space (and we're likely to upgrade this even more soon). We're looking forward to seeing the awesome things you will do with it.
Thank you very, very much for supporting Neocities. It means a lot to us. It also helps us keep the free tier for others, so your support helps everyone. We'll try our hardest to keep improving the site and stick to our core values (NO MARKETING OR ADVERTISING, EVER).