nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup, yoq

Browse source
This commit is contained in:
Dennis Collinson 2012-02-08 17:25:25 -08:00
parent 062204e963
commit 74409d64b5
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/profiles_controller.rb
View file

@ -27,7 +27,6 @@ class ProfilesController < ApplicationController
munge_tag_string munge_tag_string
#checkbox tags wtf #checkbox tags wtf
@profile_attrs[:nsfw] ||= false
@profile_attrs[:searchable] ||= false @profile_attrs[:searchable] ||= false
@profile_attrs[:nsfw] ||= false @profile_attrs[:nsfw] ||= false

12
features/not_safe_for_work.feature
View file

@ -10,7 +10,9 @@ Scenario: Setting not safe for work
And I submit the form And I submit the form
Then I should be on the edit profile page Then I should be on the edit profile page
And I should see the "you are nsfw" message And I should see the "you are nsfw" message
When I mark myself as safe for work
And I submit the form
Then I should see the "you are safe for work" message
Scenario: NSFWs users posts are nsfw Scenario: NSFWs users posts are nsfw
Given a nsfw user with email "tommy@pr0nking.com" Given a nsfw user with email "tommy@pr0nking.com"
@ -18,14 +20,6 @@ Scenario: NSFWs users posts are nsfw
And I post "I love 0bj3ction4bl3 c0nt3nt!" And I post "I love 0bj3ction4bl3 c0nt3nt!"
Then the post "I love 0bj3ction4bl3 c0nt3nt!" should be marked nsfw Then the post "I love 0bj3ction4bl3 c0nt3nt!" should be marked nsfw
Scenario: Making yourself SFW
Given a nsfw user with email "tommy@pr0nking.com"
And I sign in as "tommy@pr0nking.com"
And I go to the edit profile page
When I mark myself as safe for work
And I submit the form
Then I should see the "you are safe for work" message
# And I log out # And I log out
# And I log in as an office worker # And I log in as an office worker
# And I am folllowing "tommy@pr0n.xxx" # And I am folllowing "tommy@pr0n.xxx"