Commit 0ff46816 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fixed event.allowed? with event.proper?

parent f03dc871
...@@ -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
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
@events.each do |event| @events.each do |event|
if event.allowed? if event.proper?
event = EventDecorator.decorate(event) event = EventDecorator.decorate(event)
xml.entry do xml.entry do
event_link = event.feed_url event_link = event.feed_url
......
...@@ -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
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
@events.each do |event| @events.each do |event|
if event.allowed? if event.proper?
event = EventDecorator.decorate(event) event = EventDecorator.decorate(event)
xml.entry do xml.entry do
event_link = event.feed_url event_link = event.feed_url
......
...@@ -59,7 +59,7 @@ describe Event do ...@@ -59,7 +59,7 @@ describe Event do
end end
it { @event.push?.should be_true } it { @event.push?.should be_true }
it { @event.allowed?.should be_true } it { @event.proper?.should be_true }
it { @event.new_branch?.should be_true } it { @event.new_branch?.should be_true }
it { @event.tag?.should be_false } it { @event.tag?.should be_false }
it { @event.branch_name.should == "master" } it { @event.branch_name.should == "master" }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment