diff --git a/app/views/dashboard/index.atom.builder b/app/views/dashboard/index.atom.builder index ffa15258f078ac92df971167b4a0d0530e789b61..2bb42a65bac7f512b44ae157ad0c28cfb8a36b26 100644 --- a/app/views/dashboard/index.atom.builder +++ b/app/views/dashboard/index.atom.builder @@ -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? @events.each do |event| - if event.allowed? + if event.proper? event = EventDecorator.decorate(event) xml.entry do event_link = event.feed_url diff --git a/app/views/groups/show.atom.builder b/app/views/groups/show.atom.builder index fa3bfade28b07f8eccbceb5e03be25cfb95b860f..9aa52ea55930c5b5498f542acd1b38f499892947 100644 --- a/app/views/groups/show.atom.builder +++ b/app/views/groups/show.atom.builder @@ -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? @events.each do |event| - if event.allowed? + if event.proper? event = EventDecorator.decorate(event) xml.entry do event_link = event.feed_url diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 49cb49db375fca6e30be6c4707f618fd66f644e9..82b46b68b64d5cb3e11848bdf22e47016ea29083 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -59,7 +59,7 @@ describe Event do end 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.tag?.should be_false } it { @event.branch_name.should == "master" }