activeadmin 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activeadmin might be problematic. Click here for more details.

Files changed (322) hide show
  1. data/.gitignore +5 -1
  2. data/.travis.yml +1 -1
  3. data/.yardopts +2 -3
  4. data/CHANGELOG.md +180 -36
  5. data/CONTRIBUTING.md +12 -2
  6. data/Gemfile +9 -3
  7. data/README.rdoc +38 -65
  8. data/Rakefile +1 -3
  9. data/activeadmin.gemspec +10 -11
  10. data/app/assets/images/active_admin/index_list_icons/block_icon.svg +1 -1
  11. data/app/assets/images/active_admin/index_list_icons/blog_icon.svg +1 -1
  12. data/app/assets/images/active_admin/index_list_icons/grid_icon.svg +1 -1
  13. data/app/assets/images/active_admin/index_list_icons/table_icon.svg +1 -1
  14. data/app/assets/javascripts/active_admin/components/jquery.aa.checkbox-toggler.js.coffee +2 -2
  15. data/app/assets/javascripts/active_admin/components/jquery.aa.dropdown-menu.js.coffee +2 -2
  16. data/app/assets/javascripts/active_admin/components/jquery.aa.popover.js.coffee +2 -2
  17. data/app/assets/javascripts/active_admin/components/jquery.aa.table-checkbox-toggler.js.coffee +2 -2
  18. data/app/assets/javascripts/active_admin/lib/namespace.js.coffee +2 -1
  19. data/app/assets/javascripts/active_admin/pages/application.js.coffee +6 -1
  20. data/app/assets/stylesheets/active_admin/_base.css.scss +29 -34
  21. data/app/assets/stylesheets/active_admin/_forms.css.scss +65 -62
  22. data/app/assets/stylesheets/active_admin/_header.css.scss +57 -45
  23. data/app/assets/stylesheets/active_admin/_typography.css.scss +9 -9
  24. data/app/assets/stylesheets/active_admin/components/_batch_actions.css.scss +1 -1
  25. data/app/assets/stylesheets/active_admin/components/_blank_slates.scss +5 -5
  26. data/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss +2 -2
  27. data/app/assets/stylesheets/active_admin/components/_comments.css.scss +1 -1
  28. data/app/assets/stylesheets/active_admin/components/_date_picker.css.scss +20 -20
  29. data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +16 -16
  30. data/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss +25 -23
  31. data/app/assets/stylesheets/active_admin/components/_grid.scss +2 -2
  32. data/app/assets/stylesheets/active_admin/components/_index_list.scss +1 -1
  33. data/app/assets/stylesheets/active_admin/components/_pagination.scss +10 -10
  34. data/app/assets/stylesheets/active_admin/components/_panels.scss +1 -1
  35. data/app/assets/stylesheets/active_admin/components/_popovers.css.scss +27 -27
  36. data/app/assets/stylesheets/active_admin/components/_scopes.scss +1 -1
  37. data/app/assets/stylesheets/active_admin/components/_table_tools.css.scss +10 -10
  38. data/app/assets/stylesheets/active_admin/components/_tables.css.scss +9 -9
  39. data/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss +3 -3
  40. data/app/assets/stylesheets/active_admin/mixins/_gradients.css.scss +4 -4
  41. data/app/assets/stylesheets/active_admin/mixins/_icons.css.scss +4 -7
  42. data/app/assets/stylesheets/active_admin/mixins/_reset.css.scss +5 -5
  43. data/app/assets/stylesheets/active_admin/mixins/_rounded.css.scss +3 -3
  44. data/app/assets/stylesheets/active_admin/mixins/_sections.css.scss +6 -6
  45. data/app/assets/stylesheets/active_admin/mixins/_shadows.css.scss +8 -8
  46. data/app/assets/stylesheets/active_admin/mixins/_typography.scss +1 -1
  47. data/app/assets/stylesheets/active_admin/mixins/_utilities.scss +1 -1
  48. data/app/assets/stylesheets/active_admin/mixins/_variables.css.scss +9 -1
  49. data/app/assets/stylesheets/active_admin/pages/_logged_out.scss +1 -1
  50. data/app/assets/stylesheets/active_admin/print.css.scss +2 -8
  51. data/app/assets/stylesheets/active_admin/structure/_footer.scss +5 -5
  52. data/app/assets/stylesheets/active_admin/structure/_main_structure.scss +13 -13
  53. data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +14 -14
  54. data/app/views/active_admin/devise/passwords/edit.html.erb +1 -1
  55. data/app/views/active_admin/devise/sessions/new.html.erb +1 -1
  56. data/app/views/active_admin/devise/shared/_links.erb +8 -1
  57. data/app/views/active_admin/resource/index.csv.erb +3 -3
  58. data/app/views/layouts/active_admin_logged_out.html.erb +5 -3
  59. data/config/locales/bg.yml +101 -0
  60. data/{lib/active_admin → config}/locales/ca.yml +24 -7
  61. data/{lib/active_admin → config}/locales/cs.yml +34 -12
  62. data/{lib/active_admin → config}/locales/da.yml +29 -7
  63. data/config/locales/de-CH.yml +117 -0
  64. data/{lib/active_admin → config}/locales/de.yml +19 -9
  65. data/config/locales/en-GB.yml +90 -0
  66. data/{lib/active_admin → config}/locales/en.yml +16 -6
  67. data/config/locales/es.yml +106 -0
  68. data/{lib/active_admin/locales/es.yml → config/locales/es_MX.yml} +14 -8
  69. data/{lib/active_admin → config}/locales/fr.yml +14 -6
  70. data/{lib/active_admin → config}/locales/he.yml +16 -6
  71. data/{lib/active_admin → config}/locales/hr.yml +14 -6
  72. data/{lib/active_admin → config}/locales/hu.yml +31 -6
  73. data/{lib/active_admin → config}/locales/it.yml +14 -6
  74. data/{lib/active_admin → config}/locales/ja.yml +32 -7
  75. data/{lib/active_admin → config}/locales/ko.yml +14 -6
  76. data/{lib/active_admin → config}/locales/lt.yml +15 -6
  77. data/{lib/active_admin → config}/locales/lv.yml +14 -6
  78. data/{lib/active_admin → config}/locales/nl.yml +14 -6
  79. data/{lib/active_admin → config}/locales/no-NB.yml +14 -6
  80. data/{lib/active_admin → config}/locales/pl.yml +14 -6
  81. data/{lib/active_admin → config}/locales/pt-BR.yml +14 -6
  82. data/{lib/active_admin → config}/locales/pt-PT.yml +14 -6
  83. data/{lib/active_admin → config}/locales/ro.yml +32 -7
  84. data/{lib/active_admin → config}/locales/ru.yml +30 -8
  85. data/{lib/active_admin → config}/locales/sv-SE.yml +14 -6
  86. data/{lib/active_admin → config}/locales/tr.yml +15 -6
  87. data/config/locales/uk.yml +100 -0
  88. data/{lib/active_admin → config}/locales/vi.yml +15 -6
  89. data/{lib/active_admin → config}/locales/zh-CN.yml +15 -6
  90. data/{lib/active_admin → config}/locales/zh-TW.yml +15 -6
  91. data/docs/0-installation.md +22 -18
  92. data/docs/1-general-configuration.md +1 -1
  93. data/docs/10-custom-pages.md +3 -3
  94. data/docs/11-decorators.md +18 -2
  95. data/docs/12-arbre-components.md +53 -54
  96. data/docs/13-authorization-adapter.md +31 -10
  97. data/docs/2-resource-customization.md +16 -1
  98. data/docs/3-index-pages.md +13 -1
  99. data/docs/3-index-pages/create-an-index.md +4 -4
  100. data/docs/3-index-pages/index-as-block.md +1 -1
  101. data/docs/3-index-pages/index-as-blog.md +1 -1
  102. data/docs/3-index-pages/index-as-grid.md +1 -1
  103. data/docs/4-csv-format.md +4 -4
  104. data/docs/5-forms.md +46 -3
  105. data/docs/{6-show-screens.md → 6-show-pages.md} +3 -3
  106. data/docs/8-custom-actions.md +3 -3
  107. data/docs/9-batch-actions.md +9 -1
  108. data/features/action_item.feature +6 -6
  109. data/features/authorization_cancan.feature +1 -1
  110. data/features/belongs_to.feature +3 -3
  111. data/features/breadcrumb.feature +2 -2
  112. data/features/comments/commenting.feature +7 -5
  113. data/features/dashboard.feature +0 -51
  114. data/features/favicon.feature +20 -0
  115. data/features/global_navigation.feature +0 -1
  116. data/features/index/batch_actions.feature +12 -11
  117. data/features/index/filters.feature +6 -6
  118. data/features/index/format_as_csv.feature +4 -5
  119. data/features/index/index_as_blog.feature +20 -1
  120. data/features/index/index_as_table.feature +1 -1
  121. data/features/index/index_blank_slate.feature +3 -3
  122. data/features/index/index_parameters.feature +4 -10
  123. data/features/index/index_scope_to.feature +24 -0
  124. data/features/index/index_scopes.feature +17 -5
  125. data/features/index/pagination.feature +15 -0
  126. data/features/registering_pages.feature +1 -1
  127. data/features/registering_resources.feature +2 -2
  128. data/features/show/default_content.feature +3 -3
  129. data/features/sidebar_sections.feature +3 -3
  130. data/features/specifying_actions.feature +1 -1
  131. data/features/step_definitions/additional_web_steps.rb +3 -16
  132. data/features/step_definitions/asset_steps.rb +5 -1
  133. data/features/step_definitions/attribute_steps.rb +4 -4
  134. data/features/step_definitions/batch_action_steps.rb +25 -74
  135. data/features/step_definitions/breadcrumb_steps.rb +1 -3
  136. data/features/step_definitions/comment_steps.rb +0 -1
  137. data/features/step_definitions/configuration_steps.rb +53 -69
  138. data/features/step_definitions/dashboard_steps.rb +2 -2
  139. data/features/step_definitions/factory_steps.rb +17 -33
  140. data/features/step_definitions/filter_steps.rb +2 -2
  141. data/features/step_definitions/format_steps.rb +10 -14
  142. data/features/step_definitions/index_scope_steps.rb +9 -25
  143. data/features/step_definitions/index_views_steps.rb +1 -1
  144. data/features/step_definitions/sidebar_steps.rb +2 -1
  145. data/features/step_definitions/site_title_steps.rb +1 -1
  146. data/features/step_definitions/table_steps.rb +6 -1
  147. data/features/step_definitions/user_steps.rb +23 -38
  148. data/features/step_definitions/web_steps.rb +18 -147
  149. data/features/support/env.rb +13 -34
  150. data/features/support/paths.rb +2 -0
  151. data/features/users/logging_in.feature +2 -2
  152. data/features/users/logging_out.feature +0 -12
  153. data/features/users/resetting_password.feature +1 -1
  154. data/lib/active_admin.rb +4 -17
  155. data/lib/active_admin/abstract_view_factory.rb +1 -1
  156. data/lib/active_admin/application.rb +19 -28
  157. data/lib/active_admin/asset_registration.rb +7 -25
  158. data/lib/active_admin/authorization_adapter.rb +9 -5
  159. data/lib/active_admin/base_controller.rb +2 -2
  160. data/lib/active_admin/base_controller/authorization.rb +25 -27
  161. data/lib/active_admin/batch_actions/resource_extension.rb +3 -3
  162. data/lib/active_admin/batch_actions/views/batch_action_selector.rb +1 -1
  163. data/lib/active_admin/batch_actions/views/selection_cells.rb +1 -1
  164. data/lib/active_admin/callbacks.rb +1 -1
  165. data/lib/active_admin/cancan_adapter.rb +2 -2
  166. data/lib/active_admin/comments.rb +32 -38
  167. data/lib/active_admin/comments/comment.rb +6 -8
  168. data/lib/active_admin/comments/views.rb +0 -1
  169. data/lib/active_admin/comments/views/active_admin_comments.rb +27 -38
  170. data/lib/active_admin/csv_builder.rb +4 -6
  171. data/lib/active_admin/dependency_checker.rb +4 -0
  172. data/lib/active_admin/deprecation.rb +3 -3
  173. data/lib/active_admin/dsl.rb +5 -5
  174. data/lib/active_admin/engine.rb +1 -1
  175. data/lib/active_admin/filters.rb +2 -1
  176. data/lib/active_admin/filters/forms.rb +36 -43
  177. data/lib/active_admin/filters/formtastic_addons.rb +45 -0
  178. data/lib/active_admin/filters/resource_extension.rb +9 -1
  179. data/lib/active_admin/form_builder.rb +30 -19
  180. data/lib/active_admin/helpers/optional_display.rb +11 -13
  181. data/lib/active_admin/helpers/settings.rb +50 -8
  182. data/lib/active_admin/inputs/filter_base.rb +5 -18
  183. data/lib/active_admin/inputs/filter_base/search_method_select.rb +73 -0
  184. data/lib/active_admin/inputs/filter_boolean_input.rb +6 -14
  185. data/lib/active_admin/inputs/filter_check_boxes_input.rb +1 -1
  186. data/lib/active_admin/inputs/filter_numeric_input.rb +2 -47
  187. data/lib/active_admin/inputs/filter_select_input.rb +32 -10
  188. data/lib/active_admin/inputs/filter_string_input.rb +12 -14
  189. data/lib/active_admin/namespace.rb +8 -40
  190. data/lib/active_admin/page.rb +2 -2
  191. data/lib/active_admin/page_dsl.rb +1 -1
  192. data/lib/active_admin/reloader.rb +3 -3
  193. data/lib/active_admin/resource.rb +16 -23
  194. data/lib/active_admin/resource/belongs_to.rb +8 -5
  195. data/lib/active_admin/resource/menu.rb +10 -23
  196. data/lib/active_admin/resource/naming.rb +3 -3
  197. data/lib/active_admin/resource/page_presenters.rb +2 -2
  198. data/lib/active_admin/resource/routes.rb +74 -21
  199. data/lib/active_admin/resource/scope_to.rb +74 -0
  200. data/lib/active_admin/resource/scopes.rb +8 -4
  201. data/lib/active_admin/resource_collection.rb +20 -66
  202. data/lib/active_admin/resource_controller.rb +12 -16
  203. data/lib/active_admin/resource_controller/data_access.rb +19 -22
  204. data/lib/active_admin/resource_controller/resource_class_methods.rb +2 -2
  205. data/lib/active_admin/resource_controller/scoping.rb +4 -9
  206. data/lib/active_admin/resource_dsl.rb +5 -32
  207. data/lib/active_admin/router.rb +34 -47
  208. data/lib/active_admin/scope.rb +5 -3
  209. data/lib/active_admin/sidebar_section.rb +1 -1
  210. data/lib/active_admin/version.rb +1 -1
  211. data/lib/active_admin/view_factory.rb +1 -1
  212. data/lib/active_admin/view_helpers/auto_link_helper.rb +1 -1
  213. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +8 -8
  214. data/lib/active_admin/view_helpers/display_helper.rb +15 -6
  215. data/lib/active_admin/view_helpers/download_format_links_helper.rb +2 -2
  216. data/lib/active_admin/view_helpers/form_helper.rb +6 -1
  217. data/lib/active_admin/view_helpers/icon_helper.rb +1 -1
  218. data/lib/active_admin/view_helpers/method_or_proc_helper.rb +5 -5
  219. data/lib/active_admin/view_helpers/title_helper.rb +1 -1
  220. data/lib/active_admin/views/components/action_list_popover.rb +6 -6
  221. data/lib/active_admin/views/components/attributes_table.rb +9 -12
  222. data/lib/active_admin/views/components/blank_slate.rb +4 -4
  223. data/lib/active_admin/views/components/columns.rb +1 -1
  224. data/lib/active_admin/views/components/index_list.rb +1 -1
  225. data/lib/active_admin/views/components/paginated_collection.rb +20 -12
  226. data/lib/active_admin/views/components/panel.rb +1 -1
  227. data/lib/active_admin/views/components/scopes.rb +2 -1
  228. data/lib/active_admin/views/components/sidebar_section.rb +1 -1
  229. data/lib/active_admin/views/components/status_tag.rb +1 -1
  230. data/lib/active_admin/views/header.rb +2 -2
  231. data/lib/active_admin/views/index_as_blog.rb +16 -3
  232. data/lib/active_admin/views/index_as_table.rb +2 -2
  233. data/lib/active_admin/views/pages/base.rb +8 -3
  234. data/lib/active_admin/views/pages/form.rb +2 -2
  235. data/lib/active_admin/views/pages/index.rb +19 -17
  236. data/lib/generators/active_admin/assets/templates/3.0/active_admin.js +1 -1
  237. data/lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss +1 -13
  238. data/lib/generators/active_admin/devise/devise_generator.rb +22 -1
  239. data/lib/generators/active_admin/install/install_generator.rb +1 -5
  240. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +40 -19
  241. data/lib/generators/active_admin/install/templates/admin_user.rb.erb +18 -18
  242. data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb +19 -0
  243. data/lib/generators/active_admin/resource/resource_generator.rb +1 -1
  244. data/lib/generators/active_admin/resource/templates/admin.rb +1 -1
  245. data/script/use_rails +1 -1
  246. data/spec/integration/memory_spec.rb +3 -2
  247. data/spec/javascripts/coffeescripts/jquery.aa.checkbox-toggler-spec.js.coffee +4 -4
  248. data/spec/javascripts/coffeescripts/jquery.aa.popover-spec.js.coffee +1 -1
  249. data/spec/javascripts/coffeescripts/jquery.aa.table-checkbox-toggler-spec.js.coffee +2 -2
  250. data/spec/javascripts/compiled/jquery.aa.checkbox-toggler-spec.js +4 -4
  251. data/spec/javascripts/compiled/jquery.aa.popover-spec.js +1 -1
  252. data/spec/javascripts/compiled/jquery.aa.table-checkbox-toggler-spec.js +2 -2
  253. data/spec/spec_helper.rb +16 -6
  254. data/spec/spec_helper_without_rails.rb +2 -0
  255. data/spec/support/deferred_garbage_collection.rb +19 -0
  256. data/spec/support/jslint.yml +1 -1
  257. data/spec/support/rails_template.rb +29 -27
  258. data/spec/support/templates/admin/stores.rb +5 -1
  259. data/spec/unit/abstract_view_factory_spec.rb +1 -1
  260. data/spec/unit/action_builder_spec.rb +7 -7
  261. data/spec/unit/active_admin_spec.rb +0 -14
  262. data/spec/unit/application_spec.rb +16 -17
  263. data/spec/unit/asset_registration_spec.rb +21 -8
  264. data/spec/unit/authorization/authorization_adapter_spec.rb +3 -3
  265. data/spec/unit/authorization/controller_authorization_spec.rb +16 -24
  266. data/spec/unit/batch_actions/resource_spec.rb +11 -11
  267. data/spec/unit/belongs_to_spec.rb +1 -1
  268. data/spec/unit/cancan_adapter_spec.rb +11 -3
  269. data/spec/unit/comments_spec.rb +10 -28
  270. data/spec/unit/controller_filters_spec.rb +22 -24
  271. data/spec/unit/csv_builder_spec.rb +3 -3
  272. data/spec/unit/devise_spec.rb +10 -10
  273. data/spec/unit/filters/filter_form_builder_spec.rb +140 -45
  274. data/spec/unit/filters/resource_spec.rb +20 -19
  275. data/spec/unit/form_builder_spec.rb +122 -70
  276. data/spec/unit/menu_item_spec.rb +3 -3
  277. data/spec/unit/namespace/authorization_spec.rb +4 -8
  278. data/spec/unit/namespace/register_page_spec.rb +1 -1
  279. data/spec/unit/namespace/register_resource_spec.rb +12 -7
  280. data/spec/unit/namespace_spec.rb +4 -10
  281. data/spec/unit/page_spec.rb +1 -1
  282. data/spec/unit/resource/menu_spec.rb +1 -1
  283. data/spec/unit/resource/naming_spec.rb +9 -0
  284. data/spec/unit/resource/pagination_spec.rb +2 -2
  285. data/spec/unit/resource/routes_spec.rb +73 -0
  286. data/spec/unit/resource/scopes_spec.rb +1 -1
  287. data/spec/unit/resource_collection_spec.rb +95 -43
  288. data/spec/unit/resource_registration_spec.rb +3 -12
  289. data/spec/unit/resource_spec.rb +41 -48
  290. data/spec/unit/routing_spec.rb +10 -64
  291. data/spec/unit/scope_spec.rb +19 -0
  292. data/spec/unit/settings_spec.rb +88 -0
  293. data/spec/unit/view_factory_spec.rb +1 -0
  294. data/spec/unit/{breadcrumbs_spec.rb → view_helpers/breadcrumbs_spec.rb} +16 -7
  295. data/spec/unit/view_helpers/display_name_spec.rb +41 -0
  296. data/spec/unit/view_helpers/form_helper_spec.rb +36 -2
  297. data/spec/unit/views/components/attributes_table_spec.rb +17 -9
  298. data/spec/unit/views/components/batch_action_popover_spec.rb +4 -4
  299. data/spec/unit/views/components/index_list_spec.rb +2 -2
  300. data/spec/unit/views/components/paginated_collection_spec.rb +42 -0
  301. data/spec/unit/views/components/panel_spec.rb +8 -0
  302. data/spec/unit/views/components/site_title_spec.rb +2 -2
  303. data/spec/unit/views/components/table_for_spec.rb +4 -4
  304. data/spec/unit/views/pages/form_spec.rb +35 -0
  305. data/spec/unit/views/pages/layout_spec.rb +1 -1
  306. data/spec/unit/views/tabbed_navigation_spec.rb +10 -10
  307. data/tasks/parallel_tests.rake +1 -1
  308. data/tasks/test.rake +4 -1
  309. metadata +117 -106
  310. data/app/assets/stylesheets/active_admin/pages/_dashboard.scss +0 -5
  311. data/lib/active_admin/comments/views/active_admin_comment.rb +0 -0
  312. data/lib/active_admin/dashboards.rb +0 -68
  313. data/lib/active_admin/dashboards/dashboard_controller.rb +0 -50
  314. data/lib/active_admin/dashboards/section.rb +0 -34
  315. data/lib/active_admin/locales/bg.yml +0 -77
  316. data/lib/generators/active_admin/install/templates/migrations/1_create_admin_notes.rb +0 -17
  317. data/lib/generators/active_admin/install/templates/migrations/2_move_admin_notes_to_comments.rb +0 -26
  318. data/spec/unit/base_controller_spec.rb +0 -6
  319. data/spec/unit/dashboard_controller_spec.rb +0 -76
  320. data/spec/unit/dashboard_section_spec.rb +0 -56
  321. data/spec/unit/dashboards_spec.rb +0 -59
  322. data/spec/unit/display_name_spec.rb +0 -29
@@ -12,22 +12,22 @@ describe ActiveAdmin::BatchActions::BatchActionPopover do
12
12
  end
13
13
  end
14
14
  end
15
-
15
+
16
16
  it "should have an id" do
17
17
  the_popover.id.should == "batch_actions_popover"
18
18
  end
19
-
19
+
20
20
  describe "the action list" do
21
21
  subject do
22
22
  the_popover.find_by_class("popover_contents").first
23
23
  end
24
24
 
25
25
  its(:tag_name) { should eql("ul") }
26
-
26
+
27
27
  its(:content){ should include("<li><a href=\"#\" class=\"batch_action\" data-action=\"action_1\">Action 1 Selected</a></li>") }
28
28
  its(:content){ should include("<li><a href=\"#\" class=\"batch_action\" data-action=\"action_2\">Action 2 Selected</a></li>") }
29
29
  its(:content){ should include("<li><a href=\"#\" class=\"batch_action\" data-action=\"action_3\">Action 3 Selected</a></li>") }
30
-
30
+
31
31
  end
32
32
 
33
33
  end
@@ -4,10 +4,10 @@ describe ActiveAdmin::Views::IndexList do
4
4
 
5
5
  describe "#index_list_renderer" do
6
6
 
7
-
7
+
8
8
  let(:index_classes) { [ActiveAdmin::Views::IndexAsTable, ActiveAdmin::Views::IndexAsBlock] }
9
9
 
10
- let(:helpers) do
10
+ let(:helpers) do
11
11
  helpers = mock_action_view
12
12
  helpers.stub! :url_for => "/"
13
13
  helpers.stub!(:params).and_return({:as => "table"})
@@ -200,6 +200,48 @@ describe ActiveAdmin::Views::PaginatedCollection do
200
200
  end
201
201
  end
202
202
 
203
+ context "when having the param :pagination_total set to true " do
204
+ let(:view) do
205
+ view = mock_action_view
206
+ view.request.stub!(:query_parameters).and_return({:controller => 'admin/stores', :action => 'index', :page => '1'})
207
+ view.controller.params = {:controller => 'admin/stores', :action => 'index'}
208
+ view
209
+ end
210
+
211
+ let(:collection) do
212
+ stores = [Store.new] * 1000
213
+ Kaminari.paginate_array(stores).page(1).per(30)
214
+ end
215
+
216
+ let(:pagination) { paginated_collection(collection, :pagination_total => true) }
203
217
 
218
+ it "should show the total item counts" do
219
+ info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')
220
+ info.should eq "Displaying Bookstores <b>1 - 30</b> of <b>1000</b> in total"
221
+ end
222
+
223
+ end
224
+
225
+ context "when having the param :pagination_total set to false " do
226
+ let(:view) do
227
+ view = mock_action_view
228
+ view.request.stub!(:query_parameters).and_return({:controller => 'admin/stores', :action => 'index', :page => '1'})
229
+ view.controller.params = {:controller => 'admin/stores', :action => 'index'}
230
+ view
231
+ end
232
+
233
+ let(:collection) do
234
+ stores = [Store.new] * 1000
235
+ Kaminari.paginate_array(stores).page(1).per(30)
236
+ end
237
+
238
+ let(:pagination) { paginated_collection(collection, :pagination_total => false) }
239
+
240
+ it "should not show the total item counts" do
241
+ info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')
242
+ info.should eq "Displaying Bookstores <b>1 - 30</b>"
243
+ end
244
+
245
+ end
204
246
  end
205
247
  end
@@ -29,6 +29,14 @@ describe ActiveAdmin::Views::Panel do
29
29
  the_panel.find_by_tag("h3").first.content.should include("span class=\"icon")
30
30
  end
31
31
 
32
+ it "should allow a html_safe title (without icon)" do
33
+ title_with_html = %q[Title with <abbr>HTML</abbr>].html_safe
34
+ the_panel = render_arbre_component do
35
+ panel(title_with_html)
36
+ end
37
+ the_panel.find_by_tag("h3").first.content.should eq(title_with_html)
38
+ end
39
+
32
40
  describe "#children?" do
33
41
 
34
42
  it "returns false if no children have been added to the panel" do
@@ -13,7 +13,7 @@ describe ActiveAdmin::Views::SiteTitle do
13
13
  context "when a value" do
14
14
 
15
15
  it "renders the string when a string is passed in" do
16
- namespace = mock :site_title => "Hello World",
16
+ namespace = mock :site_title => "Hello World",
17
17
  :site_title_image => nil,
18
18
  :site_title_link => nil
19
19
 
@@ -63,7 +63,7 @@ describe ActiveAdmin::Views::SiteTitle do
63
63
  context "when a link is present" do
64
64
 
65
65
  it "renders the string when a string is passed in" do
66
- namespace = mock :site_title => "Hello World",
66
+ namespace = mock :site_title => "Hello World",
67
67
  :site_title_image => nil,
68
68
  :site_title_link => "/"
69
69
 
@@ -48,7 +48,7 @@ describe ActiveAdmin::Views::TableFor do
48
48
  table.find_by_tag("th").first.content.should == "Title"
49
49
  table.find_by_tag("th").last.content.should == "Created At"
50
50
  end
51
-
51
+
52
52
  it "should add a class to each table header based on the col name" do
53
53
  table.find_by_tag("th").first.class_list.should include("title")
54
54
  table.find_by_tag("th").last.class_list.should include("created_at")
@@ -61,7 +61,7 @@ describe ActiveAdmin::Views::TableFor do
61
61
  it "should create a cell for each column" do
62
62
  table.find_by_tag("td").size.should == 6
63
63
  end
64
-
64
+
65
65
  it "should add a class for each cell based on the col name" do
66
66
  table.find_by_tag("td").first.class_list.should include("title")
67
67
  table.find_by_tag("td").last.class_list.should include("created_at")
@@ -83,8 +83,8 @@ describe ActiveAdmin::Views::TableFor do
83
83
  table.find_by_tag("th").first.class_list.should include("title")
84
84
  end
85
85
 
86
- [ "<span>First Post</span>",
87
- "<span>Second Post</span>",
86
+ [ "<span>First Post</span>",
87
+ "<span>Second Post</span>",
88
88
  "<span>Third Post</span>" ].each_with_index do |content, index|
89
89
  it "should create a cell with #{content}" do
90
90
  table.find_by_tag("td")[index].content.strip.should == content
@@ -0,0 +1,35 @@
1
+ require "spec_helper"
2
+
3
+ describe ActiveAdmin::Views::Pages::Form do
4
+ describe "#title" do
5
+ let!(:application){ ActiveAdmin::Application.new }
6
+ let(:namespace){ ActiveAdmin::Namespace.new(application, "Admin") }
7
+ let!(:params){ { :controller => "UsersController", :action => "edit" } }
8
+ let(:helpers) do
9
+ helpers = mock_action_view
10
+ helpers.stub :active_admin_config => namespace.register(Post),
11
+ :params => params
12
+
13
+ helpers
14
+ end
15
+
16
+ let(:arbre_context) do
17
+ OpenStruct.new(:params => params, :helpers => helpers, :assigns => {})
18
+ end
19
+
20
+ context "when page_title is assigned" do
21
+ it "should show the set page title" do
22
+ arbre_context.assigns[:page_title] = "My Page Title"
23
+ page = ActiveAdmin::Views::Pages::Form.new(arbre_context)
24
+ page.title.should eq "My Page Title"
25
+ end
26
+ end
27
+
28
+ context "when page_title is not assigned" do
29
+ it "should show the correct I18n text" do
30
+ page = ActiveAdmin::Views::Pages::Form.new(arbre_context)
31
+ page.title.should eq "Edit Post"
32
+ end
33
+ end
34
+ end
35
+ end
@@ -3,7 +3,7 @@ require 'spec_helper'
3
3
  describe ActiveAdmin::Views::Pages::Layout do
4
4
 
5
5
  let(:assigns){ {} }
6
- let(:helpers) do
6
+ let(:helpers) do
7
7
  helpers = mock_action_view
8
8
 
9
9
  helpers.stub :active_admin_application => active_admin_application,
@@ -8,7 +8,7 @@ describe ActiveAdmin::Views::TabbedNavigation do
8
8
  let(:assigns){ { :active_admin_menu => menu } }
9
9
  let(:helpers){ mock_action_view }
10
10
 
11
- let(:tabbed_navigation) do
11
+ let(:tabbed_navigation) do
12
12
  arbre(assigns, helpers) {
13
13
  insert_tag(ActiveAdmin::Views::TabbedNavigation, active_admin_menu)
14
14
  }.children.first
@@ -32,20 +32,20 @@ describe ActiveAdmin::Views::TabbedNavigation do
32
32
  end
33
33
 
34
34
  menu.add :label => "Administration", :url => "/admin/administration" do |administration|
35
- administration.add :label => "User administration",
36
- :url => '/admin/user-administration',
37
- :priority => 10,
35
+ administration.add :label => "User administration",
36
+ :url => '/admin/user-administration',
37
+ :priority => 10,
38
38
  :if => proc { false }
39
39
  end
40
40
 
41
41
  menu.add :label => "Management", :url => "#" do |management|
42
- management.add :label => "Order management",
43
- :url => '/admin/order-management',
44
- :priority => 10,
42
+ management.add :label => "Order management",
43
+ :url => '/admin/order-management',
44
+ :priority => 10,
45
45
  :if => proc { false }
46
- management.add :label => "Bill management",
47
- :url => '/admin/bill-management',
48
- :priority => 10,
46
+ management.add :label => "Bill management",
47
+ :url => '/admin/bill-management',
48
+ :priority => 10,
49
49
  :if => :admin_logged_in?
50
50
  end
51
51
  end
@@ -57,4 +57,4 @@ namespace :parallel do
57
57
  run_in_parallel "parallel_cucumber features/"
58
58
  end
59
59
 
60
- end
60
+ end
@@ -7,8 +7,11 @@ task :setup do
7
7
  end
8
8
 
9
9
  # Run specs and cukes
10
+ # If run by Travis, submit test coverage data to www.coveralls.io
10
11
  desc "Run the full suite using 1 core"
11
- task :test => ['spec:unit', 'spec:integration', 'cucumber', 'cucumber:class_reloading']
12
+ task test: ['spec:unit', 'spec:integration', 'cucumber', 'cucumber:class_reloading'] do
13
+ require 'coveralls' and Coveralls.push! if ENV['TRAVIS']
14
+ end
12
15
 
13
16
  namespace :test do
14
17
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activeadmin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,40 +9,24 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-04-04 00:00:00.000000000 Z
12
+ date: 2013-09-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
- name: rails
16
- requirement: !ruby/object:Gem::Requirement
17
- none: false
18
- requirements:
19
- - - ! '>='
20
- - !ruby/object:Gem::Version
21
- version: 3.0.0
22
- type: :runtime
23
- prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ! '>='
28
- - !ruby/object:Gem::Version
29
- version: 3.0.0
30
- - !ruby/object:Gem::Dependency
31
- name: jquery-rails
15
+ name: arbre
32
16
  requirement: !ruby/object:Gem::Requirement
33
17
  none: false
34
18
  requirements:
35
- - - ! '>='
19
+ - - ~>
36
20
  - !ruby/object:Gem::Version
37
- version: 1.0.0
21
+ version: '1.0'
38
22
  type: :runtime
39
23
  prerelease: false
40
24
  version_requirements: !ruby/object:Gem::Requirement
41
25
  none: false
42
26
  requirements:
43
- - - ! '>='
27
+ - - ~>
44
28
  - !ruby/object:Gem::Version
45
- version: 1.0.0
29
+ version: '1.0'
46
30
  - !ruby/object:Gem::Dependency
47
31
  name: bourbon
48
32
  requirement: !ruby/object:Gem::Requirement
@@ -51,6 +35,9 @@ dependencies:
51
35
  - - ! '>='
52
36
  - !ruby/object:Gem::Version
53
37
  version: 1.0.0
38
+ - - <
39
+ - !ruby/object:Gem::Version
40
+ version: '4'
54
41
  type: :runtime
55
42
  prerelease: false
56
43
  version_requirements: !ruby/object:Gem::Requirement
@@ -59,14 +46,20 @@ dependencies:
59
46
  - - ! '>='
60
47
  - !ruby/object:Gem::Version
61
48
  version: 1.0.0
49
+ - - <
50
+ - !ruby/object:Gem::Version
51
+ version: '4'
62
52
  - !ruby/object:Gem::Dependency
63
- name: meta_search
53
+ name: devise
64
54
  requirement: !ruby/object:Gem::Requirement
65
55
  none: false
66
56
  requirements:
67
57
  - - ! '>='
68
58
  - !ruby/object:Gem::Version
69
- version: 0.9.2
59
+ version: 1.5.4
60
+ - - <
61
+ - !ruby/object:Gem::Version
62
+ version: '4'
70
63
  type: :runtime
71
64
  prerelease: false
72
65
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,47 +67,53 @@ dependencies:
74
67
  requirements:
75
68
  - - ! '>='
76
69
  - !ruby/object:Gem::Version
77
- version: 0.9.2
70
+ version: 1.5.4
71
+ - - <
72
+ - !ruby/object:Gem::Version
73
+ version: '4'
78
74
  - !ruby/object:Gem::Dependency
79
- name: devise
75
+ name: formtastic
80
76
  requirement: !ruby/object:Gem::Requirement
81
77
  none: false
82
78
  requirements:
83
- - - ! '>='
79
+ - - ~>
84
80
  - !ruby/object:Gem::Version
85
- version: 1.1.2
81
+ version: '2.0'
86
82
  type: :runtime
87
83
  prerelease: false
88
84
  version_requirements: !ruby/object:Gem::Requirement
89
85
  none: false
90
86
  requirements:
91
- - - ! '>='
87
+ - - ~>
92
88
  - !ruby/object:Gem::Version
93
- version: 1.1.2
89
+ version: '2.0'
94
90
  - !ruby/object:Gem::Dependency
95
- name: formtastic
91
+ name: inherited_resources
96
92
  requirement: !ruby/object:Gem::Requirement
97
93
  none: false
98
94
  requirements:
99
- - - ! '>='
95
+ - - ~>
100
96
  - !ruby/object:Gem::Version
101
- version: 2.0.0
97
+ version: '1.3'
102
98
  type: :runtime
103
99
  prerelease: false
104
100
  version_requirements: !ruby/object:Gem::Requirement
105
101
  none: false
106
102
  requirements:
107
- - - ! '>='
103
+ - - ~>
108
104
  - !ruby/object:Gem::Version
109
- version: 2.0.0
105
+ version: '1.3'
110
106
  - !ruby/object:Gem::Dependency
111
- name: inherited_resources
107
+ name: jquery-rails
112
108
  requirement: !ruby/object:Gem::Requirement
113
109
  none: false
114
110
  requirements:
115
111
  - - ! '>='
116
112
  - !ruby/object:Gem::Version
117
- version: 1.3.1
113
+ version: 1.0.0
114
+ - - <
115
+ - !ruby/object:Gem::Version
116
+ version: '3'
118
117
  type: :runtime
119
118
  prerelease: false
120
119
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,47 +121,53 @@ dependencies:
122
121
  requirements:
123
122
  - - ! '>='
124
123
  - !ruby/object:Gem::Version
125
- version: 1.3.1
124
+ version: 1.0.0
125
+ - - <
126
+ - !ruby/object:Gem::Version
127
+ version: '3'
126
128
  - !ruby/object:Gem::Dependency
127
129
  name: kaminari
128
130
  requirement: !ruby/object:Gem::Requirement
129
131
  none: false
130
132
  requirements:
131
- - - ! '>='
133
+ - - ~>
132
134
  - !ruby/object:Gem::Version
133
- version: 0.13.0
135
+ version: '0.13'
134
136
  type: :runtime
135
137
  prerelease: false
136
138
  version_requirements: !ruby/object:Gem::Requirement
137
139
  none: false
138
140
  requirements:
139
- - - ! '>='
141
+ - - ~>
140
142
  - !ruby/object:Gem::Version
141
- version: 0.13.0
143
+ version: '0.13'
142
144
  - !ruby/object:Gem::Dependency
143
- name: sass
145
+ name: meta_search
144
146
  requirement: !ruby/object:Gem::Requirement
145
147
  none: false
146
148
  requirements:
147
- - - ! '>='
149
+ - - ~>
148
150
  - !ruby/object:Gem::Version
149
- version: 3.1.0
151
+ version: '1.0'
150
152
  type: :runtime
151
153
  prerelease: false
152
154
  version_requirements: !ruby/object:Gem::Requirement
153
155
  none: false
154
156
  requirements:
155
- - - ! '>='
157
+ - - ~>
156
158
  - !ruby/object:Gem::Version
157
- version: 3.1.0
159
+ version: '1.0'
158
160
  - !ruby/object:Gem::Dependency
159
- name: fastercsv
161
+ name: rails
160
162
  requirement: !ruby/object:Gem::Requirement
161
163
  none: false
162
164
  requirements:
163
165
  - - ! '>='
164
166
  - !ruby/object:Gem::Version
165
- version: '0'
167
+ version: 3.0.0
168
+ - - <
169
+ - !ruby/object:Gem::Version
170
+ version: '4'
166
171
  type: :runtime
167
172
  prerelease: false
168
173
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,23 +175,26 @@ dependencies:
170
175
  requirements:
171
176
  - - ! '>='
172
177
  - !ruby/object:Gem::Version
173
- version: '0'
178
+ version: 3.0.0
179
+ - - <
180
+ - !ruby/object:Gem::Version
181
+ version: '4'
174
182
  - !ruby/object:Gem::Dependency
175
- name: arbre
183
+ name: sass
176
184
  requirement: !ruby/object:Gem::Requirement
177
185
  none: false
178
186
  requirements:
179
- - - ! '>='
187
+ - - ~>
180
188
  - !ruby/object:Gem::Version
181
- version: 1.0.1
189
+ version: '3.1'
182
190
  type: :runtime
183
191
  prerelease: false
184
192
  version_requirements: !ruby/object:Gem::Requirement
185
193
  none: false
186
194
  requirements:
187
- - - ! '>='
195
+ - - ~>
188
196
  - !ruby/object:Gem::Version
189
- version: 1.0.1
197
+ version: '3.1'
190
198
  description: The administration framework for Ruby on Rails.
191
199
  email:
192
200
  - gregdbell@gmail.com
@@ -264,7 +272,6 @@ files:
264
272
  - app/assets/stylesheets/active_admin/mixins/_typography.scss
265
273
  - app/assets/stylesheets/active_admin/mixins/_utilities.scss
266
274
  - app/assets/stylesheets/active_admin/mixins/_variables.css.scss
267
- - app/assets/stylesheets/active_admin/pages/_dashboard.scss
268
275
  - app/assets/stylesheets/active_admin/pages/_logged_out.scss
269
276
  - app/assets/stylesheets/active_admin/print.css.scss
270
277
  - app/assets/stylesheets/active_admin/structure/_footer.scss
@@ -286,6 +293,38 @@ files:
286
293
  - app/views/active_admin/resource/show.html.arb
287
294
  - app/views/layouts/active_admin.html.arb
288
295
  - app/views/layouts/active_admin_logged_out.html.erb
296
+ - config/locales/bg.yml
297
+ - config/locales/ca.yml
298
+ - config/locales/cs.yml
299
+ - config/locales/da.yml
300
+ - config/locales/de-CH.yml
301
+ - config/locales/de.yml
302
+ - config/locales/en-GB.yml
303
+ - config/locales/en.yml
304
+ - config/locales/es.yml
305
+ - config/locales/es_MX.yml
306
+ - config/locales/fr.yml
307
+ - config/locales/he.yml
308
+ - config/locales/hr.yml
309
+ - config/locales/hu.yml
310
+ - config/locales/it.yml
311
+ - config/locales/ja.yml
312
+ - config/locales/ko.yml
313
+ - config/locales/lt.yml
314
+ - config/locales/lv.yml
315
+ - config/locales/nl.yml
316
+ - config/locales/no-NB.yml
317
+ - config/locales/pl.yml
318
+ - config/locales/pt-BR.yml
319
+ - config/locales/pt-PT.yml
320
+ - config/locales/ro.yml
321
+ - config/locales/ru.yml
322
+ - config/locales/sv-SE.yml
323
+ - config/locales/tr.yml
324
+ - config/locales/uk.yml
325
+ - config/locales/vi.yml
326
+ - config/locales/zh-CN.yml
327
+ - config/locales/zh-TW.yml
289
328
  - cucumber.yml
290
329
  - docs/0-installation.md
291
330
  - docs/1-general-configuration.md
@@ -302,7 +341,7 @@ files:
302
341
  - docs/3-index-pages/index-as-table.md
303
342
  - docs/4-csv-format.md
304
343
  - docs/5-forms.md
305
- - docs/6-show-screens.md
344
+ - docs/6-show-pages.md
306
345
  - docs/7-sidebars.md
307
346
  - docs/8-custom-actions.md
308
347
  - docs/9-batch-actions.md
@@ -317,6 +356,7 @@ files:
317
356
  - features/decorators.feature
318
357
  - features/development_reloading.feature
319
358
  - features/edit_page.feature
359
+ - features/favicon.feature
320
360
  - features/first_boot.feature
321
361
  - features/global_navigation.feature
322
362
  - features/i18n.feature
@@ -403,14 +443,10 @@ files:
403
443
  - lib/active_admin/comments/resource_helper.rb
404
444
  - lib/active_admin/comments/show_page_helper.rb
405
445
  - lib/active_admin/comments/views.rb
406
- - lib/active_admin/comments/views/active_admin_comment.rb
407
446
  - lib/active_admin/comments/views/active_admin_comments.rb
408
447
  - lib/active_admin/component.rb
409
448
  - lib/active_admin/controller_action.rb
410
449
  - lib/active_admin/csv_builder.rb
411
- - lib/active_admin/dashboards.rb
412
- - lib/active_admin/dashboards/dashboard_controller.rb
413
- - lib/active_admin/dashboards/section.rb
414
450
  - lib/active_admin/dependency_checker.rb
415
451
  - lib/active_admin/deprecation.rb
416
452
  - lib/active_admin/devise.rb
@@ -420,6 +456,7 @@ files:
420
456
  - lib/active_admin/filters.rb
421
457
  - lib/active_admin/filters/dsl.rb
422
458
  - lib/active_admin/filters/forms.rb
459
+ - lib/active_admin/filters/formtastic_addons.rb
423
460
  - lib/active_admin/filters/resource_extension.rb
424
461
  - lib/active_admin/form_builder.rb
425
462
  - lib/active_admin/helpers/collection.rb
@@ -431,40 +468,13 @@ files:
431
468
  - lib/active_admin/inputs.rb
432
469
  - lib/active_admin/inputs/datepicker_input.rb
433
470
  - lib/active_admin/inputs/filter_base.rb
471
+ - lib/active_admin/inputs/filter_base/search_method_select.rb
434
472
  - lib/active_admin/inputs/filter_boolean_input.rb
435
473
  - lib/active_admin/inputs/filter_check_boxes_input.rb
436
474
  - lib/active_admin/inputs/filter_date_range_input.rb
437
475
  - lib/active_admin/inputs/filter_numeric_input.rb
438
476
  - lib/active_admin/inputs/filter_select_input.rb
439
477
  - lib/active_admin/inputs/filter_string_input.rb
440
- - lib/active_admin/locales/bg.yml
441
- - lib/active_admin/locales/ca.yml
442
- - lib/active_admin/locales/cs.yml
443
- - lib/active_admin/locales/da.yml
444
- - lib/active_admin/locales/de.yml
445
- - lib/active_admin/locales/en.yml
446
- - lib/active_admin/locales/es.yml
447
- - lib/active_admin/locales/fr.yml
448
- - lib/active_admin/locales/he.yml
449
- - lib/active_admin/locales/hr.yml
450
- - lib/active_admin/locales/hu.yml
451
- - lib/active_admin/locales/it.yml
452
- - lib/active_admin/locales/ja.yml
453
- - lib/active_admin/locales/ko.yml
454
- - lib/active_admin/locales/lt.yml
455
- - lib/active_admin/locales/lv.yml
456
- - lib/active_admin/locales/nl.yml
457
- - lib/active_admin/locales/no-NB.yml
458
- - lib/active_admin/locales/pl.yml
459
- - lib/active_admin/locales/pt-BR.yml
460
- - lib/active_admin/locales/pt-PT.yml
461
- - lib/active_admin/locales/ro.yml
462
- - lib/active_admin/locales/ru.yml
463
- - lib/active_admin/locales/sv-SE.yml
464
- - lib/active_admin/locales/tr.yml
465
- - lib/active_admin/locales/vi.yml
466
- - lib/active_admin/locales/zh-CN.yml
467
- - lib/active_admin/locales/zh-TW.yml
468
478
  - lib/active_admin/menu.rb
469
479
  - lib/active_admin/menu_collection.rb
470
480
  - lib/active_admin/menu_item.rb
@@ -483,6 +493,7 @@ files:
483
493
  - lib/active_admin/resource/page_presenters.rb
484
494
  - lib/active_admin/resource/pagination.rb
485
495
  - lib/active_admin/resource/routes.rb
496
+ - lib/active_admin/resource/scope_to.rb
486
497
  - lib/active_admin/resource/scopes.rb
487
498
  - lib/active_admin/resource/sidebars.rb
488
499
  - lib/active_admin/resource_collection.rb
@@ -560,8 +571,7 @@ files:
560
571
  - lib/generators/active_admin/install/templates/active_admin.rb.erb
561
572
  - lib/generators/active_admin/install/templates/admin_user.rb.erb
562
573
  - lib/generators/active_admin/install/templates/dashboard.rb
563
- - lib/generators/active_admin/install/templates/migrations/1_create_admin_notes.rb
564
- - lib/generators/active_admin/install/templates/migrations/2_move_admin_notes_to_comments.rb
574
+ - lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb
565
575
  - lib/generators/active_admin/resource/resource_generator.rb
566
576
  - lib/generators/active_admin/resource/templates/admin.rb
567
577
  - script/local
@@ -589,6 +599,7 @@ files:
589
599
  - spec/javascripts/support/jquery.min.js
590
600
  - spec/spec_helper.rb
591
601
  - spec/spec_helper_without_rails.rb
602
+ - spec/support/deferred_garbage_collection.rb
592
603
  - spec/support/detect_rails_version.rb
593
604
  - spec/support/integration_example_group.rb
594
605
  - spec/support/jslint.yml
@@ -607,22 +618,16 @@ files:
607
618
  - spec/unit/authorization/authorization_adapter_spec.rb
608
619
  - spec/unit/authorization/controller_authorization_spec.rb
609
620
  - spec/unit/auto_link_spec.rb
610
- - spec/unit/base_controller_spec.rb
611
621
  - spec/unit/batch_actions/resource_spec.rb
612
622
  - spec/unit/batch_actions/settings_spec.rb
613
623
  - spec/unit/belongs_to_spec.rb
614
- - spec/unit/breadcrumbs_spec.rb
615
624
  - spec/unit/cancan_adapter_spec.rb
616
625
  - spec/unit/comments_spec.rb
617
626
  - spec/unit/component_spec.rb
618
627
  - spec/unit/config_shared_examples.rb
619
628
  - spec/unit/controller_filters_spec.rb
620
629
  - spec/unit/csv_builder_spec.rb
621
- - spec/unit/dashboard_controller_spec.rb
622
- - spec/unit/dashboard_section_spec.rb
623
- - spec/unit/dashboards_spec.rb
624
630
  - spec/unit/devise_spec.rb
625
- - spec/unit/display_name_spec.rb
626
631
  - spec/unit/dsl_spec.rb
627
632
  - spec/unit/event_spec.rb
628
633
  - spec/unit/filters/filter_form_builder_spec.rb
@@ -649,6 +654,7 @@ files:
649
654
  - spec/unit/resource/naming_spec.rb
650
655
  - spec/unit/resource/page_presenters_spec.rb
651
656
  - spec/unit/resource/pagination_spec.rb
657
+ - spec/unit/resource/routes_spec.rb
652
658
  - spec/unit/resource/scopes_spec.rb
653
659
  - spec/unit/resource/sidebars_spec.rb
654
660
  - spec/unit/resource_collection_spec.rb
@@ -660,7 +666,10 @@ files:
660
666
  - spec/unit/routing_spec.rb
661
667
  - spec/unit/sass/helpers_spec.rb
662
668
  - spec/unit/scope_spec.rb
669
+ - spec/unit/settings_spec.rb
663
670
  - spec/unit/view_factory_spec.rb
671
+ - spec/unit/view_helpers/breadcrumbs_spec.rb
672
+ - spec/unit/view_helpers/display_name_spec.rb
664
673
  - spec/unit/view_helpers/download_format_links_helper_spec.rb
665
674
  - spec/unit/view_helpers/fields_for_spec.rb
666
675
  - spec/unit/view_helpers/form_helper_spec.rb
@@ -678,6 +687,7 @@ files:
678
687
  - spec/unit/views/components/site_title_spec.rb
679
688
  - spec/unit/views/components/status_tag_spec.rb
680
689
  - spec/unit/views/components/table_for_spec.rb
690
+ - spec/unit/views/pages/form_spec.rb
681
691
  - spec/unit/views/pages/layout_spec.rb
682
692
  - spec/unit/views/pages/show_spec.rb
683
693
  - spec/unit/views/tabbed_navigation_spec.rb
@@ -701,7 +711,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
701
711
  version: '0'
702
712
  segments:
703
713
  - 0
704
- hash: -3751499823018813299
714
+ hash: -4264867386342888448
705
715
  required_rubygems_version: !ruby/object:Gem::Requirement
706
716
  none: false
707
717
  requirements:
@@ -710,7 +720,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
710
720
  version: '0'
711
721
  segments:
712
722
  - 0
713
- hash: -3751499823018813299
723
+ hash: -4264867386342888448
714
724
  requirements: []
715
725
  rubyforge_project:
716
726
  rubygems_version: 1.8.23
@@ -729,6 +739,7 @@ test_files:
729
739
  - features/decorators.feature
730
740
  - features/development_reloading.feature
731
741
  - features/edit_page.feature
742
+ - features/favicon.feature
732
743
  - features/first_boot.feature
733
744
  - features/global_navigation.feature
734
745
  - features/i18n.feature
@@ -815,6 +826,7 @@ test_files:
815
826
  - spec/javascripts/support/jquery.min.js
816
827
  - spec/spec_helper.rb
817
828
  - spec/spec_helper_without_rails.rb
829
+ - spec/support/deferred_garbage_collection.rb
818
830
  - spec/support/detect_rails_version.rb
819
831
  - spec/support/integration_example_group.rb
820
832
  - spec/support/jslint.yml
@@ -833,22 +845,16 @@ test_files:
833
845
  - spec/unit/authorization/authorization_adapter_spec.rb
834
846
  - spec/unit/authorization/controller_authorization_spec.rb
835
847
  - spec/unit/auto_link_spec.rb
836
- - spec/unit/base_controller_spec.rb
837
848
  - spec/unit/batch_actions/resource_spec.rb
838
849
  - spec/unit/batch_actions/settings_spec.rb
839
850
  - spec/unit/belongs_to_spec.rb
840
- - spec/unit/breadcrumbs_spec.rb
841
851
  - spec/unit/cancan_adapter_spec.rb
842
852
  - spec/unit/comments_spec.rb
843
853
  - spec/unit/component_spec.rb
844
854
  - spec/unit/config_shared_examples.rb
845
855
  - spec/unit/controller_filters_spec.rb
846
856
  - spec/unit/csv_builder_spec.rb
847
- - spec/unit/dashboard_controller_spec.rb
848
- - spec/unit/dashboard_section_spec.rb
849
- - spec/unit/dashboards_spec.rb
850
857
  - spec/unit/devise_spec.rb
851
- - spec/unit/display_name_spec.rb
852
858
  - spec/unit/dsl_spec.rb
853
859
  - spec/unit/event_spec.rb
854
860
  - spec/unit/filters/filter_form_builder_spec.rb
@@ -875,6 +881,7 @@ test_files:
875
881
  - spec/unit/resource/naming_spec.rb
876
882
  - spec/unit/resource/page_presenters_spec.rb
877
883
  - spec/unit/resource/pagination_spec.rb
884
+ - spec/unit/resource/routes_spec.rb
878
885
  - spec/unit/resource/scopes_spec.rb
879
886
  - spec/unit/resource/sidebars_spec.rb
880
887
  - spec/unit/resource_collection_spec.rb
@@ -886,7 +893,10 @@ test_files:
886
893
  - spec/unit/routing_spec.rb
887
894
  - spec/unit/sass/helpers_spec.rb
888
895
  - spec/unit/scope_spec.rb
896
+ - spec/unit/settings_spec.rb
889
897
  - spec/unit/view_factory_spec.rb
898
+ - spec/unit/view_helpers/breadcrumbs_spec.rb
899
+ - spec/unit/view_helpers/display_name_spec.rb
890
900
  - spec/unit/view_helpers/download_format_links_helper_spec.rb
891
901
  - spec/unit/view_helpers/fields_for_spec.rb
892
902
  - spec/unit/view_helpers/form_helper_spec.rb
@@ -904,6 +914,7 @@ test_files:
904
914
  - spec/unit/views/components/site_title_spec.rb
905
915
  - spec/unit/views/components/status_tag_spec.rb
906
916
  - spec/unit/views/components/table_for_spec.rb
917
+ - spec/unit/views/pages/form_spec.rb
907
918
  - spec/unit/views/pages/layout_spec.rb
908
919
  - spec/unit/views/pages/show_spec.rb
909
920
  - spec/unit/views/tabbed_navigation_spec.rb