more cleanup
This commit is contained in:
parent
8819d288c4
commit
7ea6b4dd8d
3 changed files with 21 additions and 3 deletions
|
|
@ -54,8 +54,6 @@ class Comment
|
||||||
if user.owns?(self.post)
|
if user.owns?(self.post)
|
||||||
p = user.people_in_aspects(user.aspects_with_post(self.post_id))
|
p = user.people_in_aspects(user.aspects_with_post(self.post_id))
|
||||||
elsif user.owns?(self)
|
elsif user.owns?(self)
|
||||||
:A
|
|
||||||
|
|
||||||
p = [self.post.person]
|
p = [self.post.person]
|
||||||
end
|
end
|
||||||
p
|
p
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
= include_javascripts :main
|
= include_javascripts :main
|
||||||
|
|
||||||
- if current_user
|
- if current_user
|
||||||
= include_javascripts :flash_socket unless modern_browser?
|
= include_javascripts :flash_socket #unless modern_browser?
|
||||||
= javascript_include_tag 'web-socket-receiver'
|
= javascript_include_tag 'web-socket-receiver'
|
||||||
= render 'js/websocket_js'
|
= render 'js/websocket_js'
|
||||||
|
|
||||||
|
|
@ -86,6 +86,7 @@
|
||||||
|
|
||||||
.clearfix
|
.clearfix
|
||||||
|
|
||||||
|
=render :partial => 'layouts/debug.haml'
|
||||||
%footer
|
%footer
|
||||||
.container
|
.container
|
||||||
= image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
|
= image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
|
||||||
|
|
|
||||||
19
spec/lib/diaspora/webhooks_spec.rb
Normal file
19
spec/lib/diaspora/webhooks_spec.rb
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
# Copyright (c) 2010, Diaspora Inc. This file is
|
||||||
|
# licensed under the Affero General Public License version 3 or later. See
|
||||||
|
# the COPYRIGHT file.
|
||||||
|
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
describe Diaspora::Webhooks do
|
||||||
|
describe '#subscribers' do
|
||||||
|
it 'throws an error if the including module does not redefine it' do
|
||||||
|
class Foo
|
||||||
|
include Diaspora::Webhooks
|
||||||
|
end
|
||||||
|
|
||||||
|
f = Foo.new
|
||||||
|
|
||||||
|
proc{ f.subscribers(1)}.should raise_error /override subscribers/
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
Reference in a new issue