Commit 0ff468160e11270af7178d2494d0d6dabde20a6e
1 parent
f03dc871
Exists in
master
and in
4 other branches
Fixed event.allowed? with event.proper?
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
app/views/dashboard/index.atom.builder
| @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear | @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear | ||
| 7 | xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? | 7 | xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? |
| 8 | 8 | ||
| 9 | @events.each do |event| | 9 | @events.each do |event| |
| 10 | - if event.allowed? | 10 | + if event.proper? |
| 11 | event = EventDecorator.decorate(event) | 11 | event = EventDecorator.decorate(event) |
| 12 | xml.entry do | 12 | xml.entry do |
| 13 | event_link = event.feed_url | 13 | event_link = event.feed_url |
app/views/groups/show.atom.builder
| @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear | @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear | ||
| 7 | xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? | 7 | xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? |
| 8 | 8 | ||
| 9 | @events.each do |event| | 9 | @events.each do |event| |
| 10 | - if event.allowed? | 10 | + if event.proper? |
| 11 | event = EventDecorator.decorate(event) | 11 | event = EventDecorator.decorate(event) |
| 12 | xml.entry do | 12 | xml.entry do |
| 13 | event_link = event.feed_url | 13 | event_link = event.feed_url |
spec/models/event_spec.rb
| @@ -59,7 +59,7 @@ describe Event do | @@ -59,7 +59,7 @@ describe Event do | ||
| 59 | end | 59 | end |
| 60 | 60 | ||
| 61 | it { @event.push?.should be_true } | 61 | it { @event.push?.should be_true } |
| 62 | - it { @event.allowed?.should be_true } | 62 | + it { @event.proper?.should be_true } |
| 63 | it { @event.new_branch?.should be_true } | 63 | it { @event.new_branch?.should be_true } |
| 64 | it { @event.tag?.should be_false } | 64 | it { @event.tag?.should be_false } |
| 65 | it { @event.branch_name.should == "master" } | 65 | it { @event.branch_name.should == "master" } |