Skip to content

Commit 4282fae

Browse files
committed
Merge pull request activeadmin#1114 from pcreux/fix-specs-for-1.9.3
Menu::ItemCollection.sort returns an Array on Ruby 1.9.3.
2 parents e4447bd + c53d5e2 commit 4282fae

File tree

3 files changed

+1
-2
lines changed

3 files changed

+1
-2
lines changed

lib/active_admin/menu.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def [](id)
4848
@children.find_by_id(id)
4949
end
5050

51+
# @return Sorted [Array] of [MenuItem]
5152
def items
5253
@children.sort
5354
end

spec/unit/menu_item_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ module ActiveAdmin
3535
context "with no children" do
3636
it "should be empty" do
3737
item = MenuItem.new
38-
item.children.should be_an_instance_of(Menu::ItemCollection)
3938
item.children.should == []
4039
end
4140

spec/unit/menu_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
it "should have an empty item collection" do
1212
menu = Menu.new
13-
menu.items.should be_an_instance_of(Menu::ItemCollection)
1413
menu.items.should be_empty
1514
end
1615

0 commit comments

Comments
 (0)