zen 0.2.8 → 0.3b

Sign up to get free protection for your applications and to get access to all the features.
Files changed (422) hide show
  1. data/.gems +20 -0
  2. data/.mailmap +3 -2
  3. data/.rvmrc +1 -1
  4. data/.travis.yml +13 -2
  5. data/.yardopts +13 -0
  6. data/AUTHORS +1 -1
  7. data/README.md +115 -77
  8. data/Rakefile +6 -7
  9. data/bin/zen +12 -5
  10. data/guide/_static/categories/categories.png +0 -0
  11. data/guide/_static/categories/category_groups.png +0 -0
  12. data/guide/_static/categories/new_category.png +0 -0
  13. data/guide/_static/categories/new_category_group.png +0 -0
  14. data/guide/_static/comments/comments.png +0 -0
  15. data/guide/_static/comments/edit_comment.png +0 -0
  16. data/guide/_static/custom_fields/custom_field_groups.png +0 -0
  17. data/guide/_static/custom_fields/custom_field_types.png +0 -0
  18. data/guide/_static/custom_fields/custom_fields.png +0 -0
  19. data/guide/_static/custom_fields/edit_custom_field_general.png +0 -0
  20. data/guide/_static/custom_fields/edit_custom_field_group.png +0 -0
  21. data/guide/_static/custom_fields/edit_custom_field_settings.png +0 -0
  22. data/guide/_static/custom_fields/edit_custom_field_type.png +0 -0
  23. data/guide/_static/menus/edit_menu.png +0 -0
  24. data/guide/_static/menus/edit_menu_item.png +0 -0
  25. data/guide/_static/menus/menu_items.png +0 -0
  26. data/guide/_static/menus/menus.png +0 -0
  27. data/guide/_static/sections/edit_entry.png +0 -0
  28. data/guide/_static/sections/edit_entry_categories.png +0 -0
  29. data/guide/_static/sections/edit_entry_general.png +0 -0
  30. data/guide/_static/sections/edit_entry_meta.png +0 -0
  31. data/guide/_static/sections/edit_section_comments.png +0 -0
  32. data/guide/_static/sections/edit_section_general.png +0 -0
  33. data/guide/_static/sections/edit_section_groups.png +0 -0
  34. data/guide/_static/sections/entries.png +0 -0
  35. data/guide/_static/sections/sections.png +0 -0
  36. data/guide/_static/settings/overview_general.png +0 -0
  37. data/guide/_static/settings/overview_security.png +0 -0
  38. data/guide/_static/settings/overview_user.png +0 -0
  39. data/guide/_static/users/edit_user.png +0 -0
  40. data/guide/_static/users/edit_user_group.png +0 -0
  41. data/guide/_static/users/edit_user_group_permissions.png +0 -0
  42. data/guide/_static/users/edit_user_permissions.png +0 -0
  43. data/guide/_static/users/overview.png +0 -0
  44. data/guide/_static/users/user_groups_overview.png +0 -0
  45. data/guide/asset_management.md +117 -0
  46. data/{CHANGELOG.md → guide/changelog.md} +42 -0
  47. data/guide/css/common.css +20 -0
  48. data/guide/getting_started.md +61 -0
  49. data/guide/hacking.md +52 -0
  50. data/guide/installation.md +44 -0
  51. data/guide/javascript.md +352 -0
  52. data/lib/vendor/sequel_sluggable.rb +137 -0
  53. data/lib/yard/tags.rb +13 -0
  54. data/lib/zen.rb +148 -78
  55. data/lib/zen/asset_groups.rb +85 -0
  56. data/lib/zen/bin/create.rb +267 -56
  57. data/lib/zen/bin/default.rb +84 -0
  58. data/lib/zen/controller/admin_controller.rb +1 -82
  59. data/lib/zen/controller/base_controller.rb +9 -5
  60. data/lib/zen/controller/frontend_controller.rb +0 -1
  61. data/lib/zen/controller/main_controller.rb +30 -42
  62. data/lib/zen/controller/preview.rb +9 -8
  63. data/lib/zen/controller/translations.rb +49 -0
  64. data/lib/zen/error.rb +17 -0
  65. data/lib/zen/event.rb +118 -0
  66. data/lib/zen/helper/asset.rb +63 -0
  67. data/lib/zen/helper/breadcrumb.rb +1 -4
  68. data/lib/zen/helper/controller.rb +73 -0
  69. data/lib/zen/helper/locale.rb +42 -0
  70. data/lib/zen/helper/message.rb +0 -3
  71. data/lib/zen/helper/search.rb +54 -0
  72. data/lib/zen/helper/stacked_aspect.rb +249 -0
  73. data/lib/zen/helper/theme.rb +3 -10
  74. data/lib/zen/language.rb +356 -181
  75. data/lib/zen/language/en/zen_general.rb +52 -0
  76. data/lib/zen/language/en/zen_models.rb +19 -0
  77. data/lib/zen/language/nl/zen_general.rb +57 -0
  78. data/lib/zen/language/nl/zen_models.rb +22 -0
  79. data/lib/zen/language/translation.rb +132 -0
  80. data/lib/zen/languages.rb +9 -0
  81. data/lib/zen/layout/admin.xhtml +3 -3
  82. data/lib/zen/layout/login.xhtml +1 -1
  83. data/lib/zen/markup.rb +189 -0
  84. data/lib/zen/model/helper.rb +65 -0
  85. data/lib/zen/model/init.rb +62 -0
  86. data/lib/zen/model/methods.rb +6 -7
  87. data/lib/zen/package.rb +312 -201
  88. data/lib/zen/package/all.rb +4 -3
  89. data/lib/zen/package/categories/lib/categories.rb +29 -41
  90. data/lib/zen/package/categories/lib/categories/controller/categories.rb +185 -130
  91. data/lib/zen/package/categories/lib/categories/controller/category_groups.rb +172 -102
  92. data/lib/zen/package/categories/lib/categories/helper/category.rb +4 -9
  93. data/lib/zen/package/categories/lib/categories/helper/category_frontend.rb +86 -0
  94. data/lib/zen/package/categories/lib/categories/language/en/categories.rb +40 -0
  95. data/lib/zen/package/categories/lib/categories/language/en/category_groups.rb +39 -0
  96. data/lib/zen/package/categories/lib/categories/language/nl/categories.rb +42 -0
  97. data/lib/zen/package/categories/lib/categories/language/nl/category_groups.rb +42 -0
  98. data/lib/zen/package/categories/lib/categories/model/category.rb +21 -25
  99. data/lib/zen/package/categories/lib/categories/model/category_group.rb +21 -15
  100. data/lib/zen/package/categories/lib/categories/view/admin/categories/form.xhtml +25 -26
  101. data/lib/zen/package/categories/lib/categories/view/admin/categories/index.xhtml +24 -24
  102. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/form.xhtml +18 -20
  103. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/index.xhtml +21 -18
  104. data/lib/zen/package/comments/lib/comments.rb +30 -50
  105. data/lib/zen/package/comments/lib/comments/anti_spam.rb +138 -0
  106. data/lib/zen/package/comments/lib/comments/controller/comments.rb +159 -92
  107. data/lib/zen/package/comments/lib/comments/controller/comments_form.rb +122 -34
  108. data/lib/zen/package/comments/lib/comments/helper/comment.rb +0 -3
  109. data/lib/zen/package/comments/lib/comments/helper/comment_frontend.rb +90 -0
  110. data/lib/zen/package/comments/lib/comments/language/en/comments.rb +57 -0
  111. data/lib/zen/package/comments/lib/comments/language/nl/comments.rb +61 -0
  112. data/lib/zen/package/comments/lib/comments/model/comment.rb +147 -49
  113. data/lib/zen/package/comments/lib/comments/model/comment_status.rb +0 -2
  114. data/lib/zen/package/comments/lib/comments/view/admin/comments/form.xhtml +37 -40
  115. data/lib/zen/package/comments/lib/comments/view/admin/comments/index.xhtml +23 -42
  116. data/lib/zen/package/comments/migrations/1308774099_comment_status.rb +12 -4
  117. data/lib/zen/package/comments/migrations/1313851786_remove_defensio_signature.rb +11 -0
  118. data/lib/zen/package/custom_fields/lib/custom_fields.rb +40 -43
  119. data/lib/zen/package/custom_fields/lib/custom_fields/blue_form_parameters.rb +72 -17
  120. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.rb +154 -118
  121. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_types.rb +147 -90
  122. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_fields.rb +161 -131
  123. data/lib/zen/package/custom_fields/lib/custom_fields/helper/custom_field.rb +4 -9
  124. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.rb +42 -0
  125. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_types.rb +51 -0
  126. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_fields.rb +60 -0
  127. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.rb +41 -0
  128. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_types.rb +49 -0
  129. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.rb +61 -0
  130. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field.rb +18 -23
  131. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_group.rb +20 -19
  132. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_method.rb +1 -3
  133. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_type.rb +19 -9
  134. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_value.rb +18 -15
  135. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/form.xhtml +18 -18
  136. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/index.xhtml +30 -24
  137. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/form.xhtml +15 -10
  138. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/index.xhtml +24 -19
  139. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/form.xhtml +18 -13
  140. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/index.xhtml +30 -20
  141. data/lib/zen/package/extensions/lib/extensions.rb +20 -0
  142. data/lib/zen/package/extensions/lib/extensions/controller/extensions.rb +41 -0
  143. data/lib/zen/package/extensions/lib/extensions/language/en/extensions.rb +23 -0
  144. data/lib/zen/package/extensions/lib/extensions/language/nl/extensions.rb +25 -0
  145. data/lib/zen/package/extensions/lib/extensions/view/admin/extensions/index.xhtml +86 -0
  146. data/lib/zen/package/menu.rb +109 -0
  147. data/lib/zen/package/menus/lib/menus.rb +25 -34
  148. data/lib/zen/package/menus/lib/menus/controller/menu_items.rb +143 -107
  149. data/lib/zen/package/menus/lib/menus/controller/menus.rb +166 -115
  150. data/lib/zen/package/menus/lib/menus/helper/menu.rb +2 -8
  151. data/lib/zen/package/menus/lib/menus/helper/menu_frontend.rb +114 -0
  152. data/lib/zen/package/menus/lib/menus/language/en/menu_items.rb +48 -0
  153. data/lib/zen/package/menus/lib/menus/language/en/menus.rb +48 -0
  154. data/lib/zen/package/menus/lib/menus/language/nl/menu_items.rb +48 -0
  155. data/lib/zen/package/menus/lib/menus/language/nl/menus.rb +50 -0
  156. data/lib/zen/package/menus/lib/menus/model/menu.rb +24 -17
  157. data/lib/zen/package/menus/lib/menus/model/menu_item.rb +37 -13
  158. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/form.xhtml +32 -25
  159. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml +23 -17
  160. data/lib/zen/package/menus/lib/menus/view/admin/menus/form.xhtml +31 -26
  161. data/lib/zen/package/menus/lib/menus/view/admin/menus/index.xhtml +20 -22
  162. data/lib/zen/package/sections/lib/sections.rb +25 -68
  163. data/lib/zen/package/sections/lib/sections/controller/section_entries.rb +178 -138
  164. data/lib/zen/package/sections/lib/sections/controller/sections.rb +173 -140
  165. data/lib/zen/package/sections/lib/sections/helper/section.rb +3 -6
  166. data/lib/zen/package/sections/lib/sections/helper/section_frontend.rb +146 -0
  167. data/lib/zen/package/sections/lib/sections/language/en/section_entries.rb +50 -0
  168. data/lib/zen/package/sections/lib/sections/language/en/sections.rb +55 -0
  169. data/lib/zen/package/sections/lib/sections/language/nl/section_entries.rb +50 -0
  170. data/lib/zen/package/sections/lib/sections/language/nl/sections.rb +55 -0
  171. data/lib/zen/package/sections/lib/sections/model/section.rb +36 -36
  172. data/lib/zen/package/sections/lib/sections/model/section_entry.rb +52 -59
  173. data/lib/zen/package/sections/lib/sections/model/section_entry_status.rb +2 -2
  174. data/lib/zen/package/sections/lib/sections/view/admin/form.xhtml +24 -21
  175. data/lib/zen/package/sections/lib/sections/view/admin/index.xhtml +24 -26
  176. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/form.xhtml +33 -31
  177. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/index.xhtml +24 -25
  178. data/lib/zen/package/sections/migrations/1308672298_use_id_for_default_section.rb +14 -10
  179. data/lib/zen/package/sections/migrations/1308813320_section_entry_statuses.rb +12 -6
  180. data/lib/zen/package/settings/lib/settings.rb +25 -120
  181. data/lib/zen/package/settings/lib/settings/blue_form_parameters.rb +157 -0
  182. data/lib/zen/package/settings/lib/settings/controller/settings.rb +94 -69
  183. data/lib/zen/package/settings/lib/settings/language/en/settings.rb +41 -0
  184. data/lib/zen/package/settings/lib/settings/language/nl/settings.rb +41 -0
  185. data/lib/zen/package/settings/lib/settings/model/setting.rb +0 -2
  186. data/lib/zen/package/settings/lib/settings/setting.rb +379 -0
  187. data/lib/zen/package/settings/lib/settings/setting_groups.rb +11 -0
  188. data/lib/zen/package/settings/lib/settings/settings.rb +83 -0
  189. data/lib/zen/package/settings/lib/settings/settings_group.rb +84 -0
  190. data/lib/zen/package/settings/lib/settings/singleton_methods.rb +35 -0
  191. data/lib/zen/package/settings/lib/settings/view/admin/settings/index.xhtml +15 -57
  192. data/lib/zen/package/settings/migrations/1321197919_remove_unused_columns.rb +17 -0
  193. data/lib/zen/package/users/lib/users.rb +51 -36
  194. data/lib/zen/package/users/lib/users/controller/user_groups.rb +133 -98
  195. data/lib/zen/package/users/lib/users/controller/users.rb +253 -136
  196. data/lib/zen/package/users/lib/users/helper/access.rb +102 -0
  197. data/lib/zen/package/users/lib/users/helper/acl.rb +113 -0
  198. data/lib/zen/package/users/lib/users/helper/users.rb +41 -24
  199. data/lib/zen/package/users/lib/users/language/en/permissions.rb +16 -0
  200. data/lib/zen/package/users/lib/users/language/en/user_groups.rb +39 -0
  201. data/lib/zen/package/users/lib/users/language/en/users.rb +73 -0
  202. data/lib/zen/package/users/lib/users/language/nl/permissions.rb +16 -0
  203. data/lib/zen/package/users/lib/users/language/nl/user_groups.rb +41 -0
  204. data/lib/zen/package/users/lib/users/language/nl/users.rb +74 -0
  205. data/lib/zen/package/users/lib/users/model/permission.rb +28 -0
  206. data/lib/zen/package/users/lib/users/model/user.rb +104 -65
  207. data/lib/zen/package/users/lib/users/model/user_group.rb +28 -24
  208. data/lib/zen/package/users/lib/users/model/user_status.rb +27 -0
  209. data/lib/zen/package/users/lib/users/public/admin/css/users/permissions.css +22 -0
  210. data/lib/zen/package/users/lib/users/public/admin/js/users/permissions.js +33 -0
  211. data/lib/zen/package/users/lib/users/settings.rb +19 -0
  212. data/lib/zen/package/users/lib/users/view/admin/user-groups/form.xhtml +58 -28
  213. data/lib/zen/package/users/lib/users/view/admin/user-groups/index.xhtml +19 -15
  214. data/lib/zen/package/users/lib/users/view/admin/users/form.xhtml +93 -62
  215. data/lib/zen/package/users/lib/users/view/admin/users/index.xhtml +23 -36
  216. data/lib/zen/package/users/lib/users/view/admin/users/login.xhtml +13 -6
  217. data/lib/zen/package/users/lib/users/view/admin/users/permissions.xhtml +33 -0
  218. data/lib/zen/package/users/lib/users/view/admin/users/register.xhtml +52 -0
  219. data/lib/zen/package/users/migrations/1313786058_update_default_date.rb +41 -0
  220. data/lib/zen/package/users/migrations/1316432327_permissions.rb +36 -0
  221. data/lib/zen/package/users/migrations/1320272365_status_ids.rb +67 -0
  222. data/lib/zen/public/admin/css/zen/buttons.css +3 -11
  223. data/lib/zen/public/admin/css/zen/datepicker.css +23 -13
  224. data/lib/zen/public/admin/css/zen/editor.css +6 -14
  225. data/lib/zen/public/admin/css/zen/forms.css +19 -12
  226. data/lib/zen/public/admin/css/zen/general.css +22 -18
  227. data/lib/zen/public/admin/css/zen/grid.css +1 -20
  228. data/lib/zen/public/admin/css/zen/layout.css +26 -11
  229. data/lib/zen/public/admin/css/zen/messages.css +3 -10
  230. data/lib/zen/public/admin/css/zen/reset.css +13 -15
  231. data/lib/zen/public/admin/css/zen/tables.css +8 -10
  232. data/lib/zen/public/admin/css/zen/tabs.css +2 -10
  233. data/lib/zen/public/admin/css/zen/window.css +2 -8
  234. data/lib/zen/public/admin/js/vendor/datepicker.js +540 -240
  235. data/lib/zen/public/admin/js/vendor/mootools/core.js +273 -283
  236. data/lib/zen/public/admin/js/vendor/mootools/more.js +131 -136
  237. data/lib/zen/public/admin/js/zen/index.js +8 -14
  238. data/lib/zen/public/admin/js/zen/lib/editor.js +36 -33
  239. data/lib/zen/public/admin/js/zen/lib/editor/markdown.js +0 -6
  240. data/lib/zen/public/admin/js/zen/lib/editor/textile.js +0 -6
  241. data/lib/zen/public/admin/js/zen/lib/html_table.js +0 -5
  242. data/lib/zen/public/admin/js/zen/lib/tabs.js +22 -79
  243. data/lib/zen/public/admin/js/zen/lib/window.js +12 -22
  244. data/lib/zen/spec/bacon/color_output.rb +1 -1
  245. data/lib/zen/spec/helper.rb +6 -11
  246. data/lib/zen/spec/simplecov.rb +3 -3
  247. data/lib/zen/task.rb +0 -1
  248. data/lib/zen/task/build.rake +46 -26
  249. data/lib/zen/task/clean.rake +14 -7
  250. data/lib/zen/task/db.rake +31 -29
  251. data/lib/zen/task/package.rake +19 -23
  252. data/lib/zen/task/proto.rake +3 -5
  253. data/lib/zen/task/setup.rake +4 -0
  254. data/lib/zen/task/test.rake +31 -6
  255. data/lib/zen/task/theme.rake +13 -19
  256. data/lib/zen/theme.rb +377 -52
  257. data/lib/zen/validation.rb +22 -30
  258. data/lib/zen/version.rb +1 -2
  259. data/lib/zen/view/bottom.xhtml +9 -1
  260. data/lib/zen/view/head.xhtml +1 -1
  261. data/lib/zen/view/main.xhtml +1 -1
  262. data/lib/zen/view/search.xhtml +9 -0
  263. data/proto/app/Rakefile +0 -1
  264. data/proto/app/app.rb +21 -16
  265. data/proto/app/config/config.rb.erb +41 -0
  266. data/proto/app/config/{database.rb → database.rb.erb} +17 -14
  267. data/proto/app/config/middlewares.rb +1 -1
  268. data/proto/app/theme/default/index.xhtml +25 -0
  269. data/proto/app/theme/theme.rb +19 -0
  270. data/proto/app/{log/database/dev → tmp}/.gitkeep +0 -0
  271. data/proto/migration.rb +3 -5
  272. data/proto/rack/thin.yml +41 -0
  273. data/proto/rack/unicorn.rb +38 -0
  274. data/spec/Rakefile +15 -11
  275. data/spec/fixtures/zen/helper/controller.rb +13 -0
  276. data/spec/fixtures/zen/helper/locale.rb +7 -0
  277. data/spec/fixtures/zen/helper/message.rb +0 -4
  278. data/spec/fixtures/zen/language.rb +31 -0
  279. data/spec/fixtures/zen/language/en/spec.rb +11 -0
  280. data/spec/fixtures/zen/language/nl/spec.rb +11 -0
  281. data/spec/fixtures/zen/package.rb +0 -10
  282. data/spec/fixtures/zen/package/categories/helper/category_frontend.rb +16 -0
  283. data/spec/fixtures/zen/package/comments/helper/comment_frontend.rb +16 -0
  284. data/spec/fixtures/zen/package/sections/helper/section_frontend.rb +16 -0
  285. data/spec/fixtures/zen/package/settings/controller/settings.rb +17 -0
  286. data/spec/fixtures/zen/package/users/helper/access.rb +18 -0
  287. data/spec/fixtures/zen/package/users/helper/acl.rb +23 -0
  288. data/spec/fixtures/zen/theme/{default-section → default}/index.xhtml +0 -0
  289. data/spec/helper.rb +12 -27
  290. data/{proto/app/log/database/live → spec/public}/.gitkeep +0 -0
  291. data/spec/zen/controller/admin_controller.rb +5 -6
  292. data/spec/zen/controller/main_controller.rb +29 -35
  293. data/spec/zen/controller/preview.rb +9 -10
  294. data/spec/zen/event.rb +44 -0
  295. data/spec/zen/helper/breadcrumb.rb +4 -5
  296. data/spec/zen/helper/controller.rb +21 -0
  297. data/spec/zen/helper/locale.rb +25 -0
  298. data/spec/zen/helper/message.rb +4 -11
  299. data/spec/zen/helper/theme.rb +11 -14
  300. data/spec/zen/language.rb +48 -22
  301. data/spec/zen/markup.rb +39 -0
  302. data/spec/zen/package.rb +48 -11
  303. data/spec/zen/package/categories/controller/categories.rb +99 -45
  304. data/spec/zen/package/categories/controller/category_groups.rb +109 -33
  305. data/spec/zen/package/categories/helper/category.rb +19 -32
  306. data/spec/zen/package/categories/helper/category_frontend.rb +61 -0
  307. data/spec/zen/package/comments/anti_spam.rb +50 -0
  308. data/spec/zen/package/comments/controller/comments.rb +121 -61
  309. data/spec/zen/package/comments/controller/comments_form.rb +120 -94
  310. data/spec/zen/package/comments/helper/comment.rb +13 -13
  311. data/spec/zen/package/comments/helper/comment_frontend.rb +92 -0
  312. data/spec/zen/package/custom_fields/blue_form_parameters.rb +50 -50
  313. data/spec/zen/package/custom_fields/controller/custom_field_groups.rb +135 -43
  314. data/spec/zen/package/custom_fields/controller/custom_field_types.rb +153 -48
  315. data/spec/zen/package/custom_fields/controller/custom_fields.rb +130 -51
  316. data/spec/zen/package/custom_fields/helper/custom_field.rb +8 -8
  317. data/spec/zen/package/extensions/controller/extensions.rb +38 -0
  318. data/spec/zen/package/menus/controller/menu_items.rb +121 -42
  319. data/spec/zen/package/menus/controller/menus.rb +125 -38
  320. data/spec/zen/package/menus/helper/menu.rb +26 -26
  321. data/spec/zen/package/menus/helper/menu_frontend.rb +104 -0
  322. data/spec/zen/package/sections/controller/section_entries.rb +145 -89
  323. data/spec/zen/package/sections/controller/sections.rb +130 -35
  324. data/spec/zen/package/sections/helper/section.rb +27 -38
  325. data/spec/zen/package/sections/helper/section_frontend.rb +160 -0
  326. data/spec/zen/package/settings/controller/settings.rb +73 -8
  327. data/spec/zen/package/settings/settings.rb +119 -0
  328. data/spec/zen/package/users/controller/user_groups.rb +134 -34
  329. data/spec/zen/package/users/controller/users.rb +189 -44
  330. data/spec/zen/package/users/helper/access.rb +29 -0
  331. data/spec/zen/package/users/helper/acl.rb +46 -0
  332. data/spec/zen/package/users/helper/users.rb +20 -64
  333. data/spec/zen/theme.rb +7 -9
  334. data/spec/zen/validation.rb +1 -2
  335. data/zen.gemspec +25 -22
  336. metadata +303 -222
  337. data/lib/zen/asset.rb +0 -292
  338. data/lib/zen/bin/runner.rb +0 -118
  339. data/lib/zen/error/language_error.rb +0 -10
  340. data/lib/zen/error/package_error.rb +0 -10
  341. data/lib/zen/error/plugin_error.rb +0 -10
  342. data/lib/zen/error/theme_error.rb +0 -10
  343. data/lib/zen/error/validation_error.rb +0 -10
  344. data/lib/zen/helper/acl.rb +0 -182
  345. data/lib/zen/helper/blue_form_vendor.rb +0 -689
  346. data/lib/zen/language/en/zen_general.yml +0 -25
  347. data/lib/zen/language/en/zen_models.yml +0 -13
  348. data/lib/zen/language/nl/zen_general.yml +0 -25
  349. data/lib/zen/language/nl/zen_models.yml +0 -13
  350. data/lib/zen/model/settings.rb +0 -78
  351. data/lib/zen/package/base.rb +0 -62
  352. data/lib/zen/package/categories/lib/categories/language/en/categories.yml +0 -36
  353. data/lib/zen/package/categories/lib/categories/language/en/category_groups.yml +0 -34
  354. data/lib/zen/package/categories/lib/categories/language/nl/categories.yml +0 -40
  355. data/lib/zen/package/categories/lib/categories/language/nl/category_groups.yml +0 -34
  356. data/lib/zen/package/categories/lib/categories/plugin/categories.rb +0 -141
  357. data/lib/zen/package/comments/lib/comments/language/en/comments.yml +0 -48
  358. data/lib/zen/package/comments/lib/comments/language/nl/comments.yml +0 -50
  359. data/lib/zen/package/comments/lib/comments/plugin/anti_spam.rb +0 -156
  360. data/lib/zen/package/comments/lib/comments/plugin/comments.rb +0 -115
  361. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.yml +0 -33
  362. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_types.yml +0 -40
  363. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_fields.yml +0 -54
  364. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.yml +0 -33
  365. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_types.yml +0 -40
  366. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.yml +0 -54
  367. data/lib/zen/package/menus/lib/menus/language/en/menu_items.yml +0 -41
  368. data/lib/zen/package/menus/lib/menus/language/en/menus.yml +0 -40
  369. data/lib/zen/package/menus/lib/menus/language/nl/menu_items.yml +0 -41
  370. data/lib/zen/package/menus/lib/menus/language/nl/menus.yml +0 -40
  371. data/lib/zen/package/menus/lib/menus/plugin/menus.rb +0 -152
  372. data/lib/zen/package/sections/lib/sections/language/en/section_entries.yml +0 -44
  373. data/lib/zen/package/sections/lib/sections/language/en/sections.yml +0 -48
  374. data/lib/zen/package/sections/lib/sections/language/nl/section_entries.yml +0 -44
  375. data/lib/zen/package/sections/lib/sections/language/nl/sections.yml +0 -48
  376. data/lib/zen/package/sections/lib/sections/plugin/section_entries.rb +0 -244
  377. data/lib/zen/package/sections/lib/sections/plugin/sections.rb +0 -87
  378. data/lib/zen/package/settings/lib/settings/language/en/settings.yml +0 -36
  379. data/lib/zen/package/settings/lib/settings/language/nl/settings.yml +0 -37
  380. data/lib/zen/package/settings/lib/settings/plugin/group_base.rb +0 -39
  381. data/lib/zen/package/settings/lib/settings/plugin/setting_base.rb +0 -133
  382. data/lib/zen/package/settings/lib/settings/plugin/settings.rb +0 -251
  383. data/lib/zen/package/users/lib/users/controller/access_rules.rb +0 -284
  384. data/lib/zen/package/users/lib/users/language/en/access_rules.yml +0 -38
  385. data/lib/zen/package/users/lib/users/language/en/user_groups.yml +0 -32
  386. data/lib/zen/package/users/lib/users/language/en/users.yml +0 -57
  387. data/lib/zen/package/users/lib/users/language/nl/access_rules.yml +0 -38
  388. data/lib/zen/package/users/lib/users/language/nl/user_groups.yml +0 -32
  389. data/lib/zen/package/users/lib/users/language/nl/users.yml +0 -57
  390. data/lib/zen/package/users/lib/users/model/access_rule.rb +0 -42
  391. data/lib/zen/package/users/lib/users/public/admin/js/users/access_rules.js +0 -65
  392. data/lib/zen/package/users/lib/users/public/admin/js/users/lib/access_rules.js +0 -49
  393. data/lib/zen/package/users/lib/users/view/admin/access-rules/form.xhtml +0 -120
  394. data/lib/zen/package/users/lib/users/view/admin/access-rules/index.xhtml +0 -102
  395. data/lib/zen/plugin.rb +0 -182
  396. data/lib/zen/plugin/base.rb +0 -46
  397. data/lib/zen/plugin/helper.rb +0 -47
  398. data/lib/zen/plugin/markup/lib/markup.rb +0 -14
  399. data/lib/zen/plugin/markup/lib/markup/language/en/markup.yml +0 -6
  400. data/lib/zen/plugin/markup/lib/markup/markup.rb +0 -165
  401. data/lib/zen/public/admin/js/zen/lib/asset.js +0 -111
  402. data/lib/zen/task/plugin.rake +0 -18
  403. data/lib/zen/theme/base.rb +0 -65
  404. data/proto/app/config/config.rb +0 -18
  405. data/spec/fixtures/zen/language/en/spec.yml +0 -10
  406. data/spec/fixtures/zen/language/nl/spec.yml +0 -7
  407. data/spec/fixtures/zen/package/settings/plugin/settings.rb +0 -20
  408. data/spec/zen/asset.rb +0 -97
  409. data/spec/zen/bin/create.rb +0 -89
  410. data/spec/zen/bin/runner.rb +0 -47
  411. data/spec/zen/helper/acl.rb +0 -149
  412. data/spec/zen/package/categories/plugin/categories.rb +0 -92
  413. data/spec/zen/package/comments/plugin/anti_spam.rb +0 -59
  414. data/spec/zen/package/comments/plugin/comments.rb +0 -107
  415. data/spec/zen/package/menus/plugin/menus.rb +0 -120
  416. data/spec/zen/package/sections/plugin/section_entries.rb +0 -161
  417. data/spec/zen/package/sections/plugin/sections.rb +0 -75
  418. data/spec/zen/package/settings/plugin/settings.rb +0 -33
  419. data/spec/zen/package/users/controller/access_rules.rb +0 -90
  420. data/spec/zen/plugin.rb +0 -64
  421. data/spec/zen/plugin/helper.rb +0 -11
  422. data/spec/zen/plugin/markup.rb +0 -44
@@ -1,33 +1,40 @@
1
1
  require File.expand_path('../../../../../helper', __FILE__)
2
2
 
3
- Zen::Language.load('users')
4
-
5
3
  describe("Users::Controller::Users") do
6
4
  behaves_like :capybara
7
5
 
6
+ login_url = Users::Controller::Users.r(:login).to_s
7
+ dashboard_url = Sections::Controller::Sections.r(:index).to_s
8
+ index_url = Users::Controller::Users.r(:index).to_s
9
+ save_button = lang('users.buttons.save')
10
+ new_button = lang('users.buttons.new')
11
+ delete_button = lang('users.buttons.delete')
12
+ status = lang('users.special.status_hash.active')
13
+
8
14
  it('Submit a form without a CSRF token') do
9
15
  response = page.driver.post(
10
16
  Users::Controller::Users.r(:save).to_s
11
17
  )
12
18
 
13
- response.body.include?(lang('zen_general.errors.csrf')).should === true
14
- response.status.should === 403
19
+ response.body.include?(lang('zen_general.errors.csrf')).should == true
20
+ response.status.should == 403
15
21
  end
16
22
 
17
23
  it('Show the login form') do
18
- login_url = Users::Controller::Users.r(:login).to_s
19
-
20
24
  visit(login_url)
21
25
 
22
- page.has_selector?('#login_form').should === true
23
- page.has_selector?('input[type="submit"][value="Login"]').should === true
24
- page.has_content?('Email').should === true
25
- page.has_content?('Password').should === true
26
+ page.has_selector?('#login_form').should == true
27
+ page.has_selector?('input[type="submit"][value="Login"]').should == true
28
+ page.has_content?('Email').should == true
29
+ page.has_content?('Password').should == true
26
30
  end
27
31
 
28
32
  it('Log in') do
29
- login_url = Users::Controller::Users.r(:login).to_s
30
- dashboard_url = Sections::Controller::Sections.r(:index).to_s
33
+ event_email = nil
34
+
35
+ Zen::Event.listen(:user_login) do |user|
36
+ event_email = user.email
37
+ end
31
38
 
32
39
  visit(login_url)
33
40
 
@@ -38,24 +45,19 @@ describe("Users::Controller::Users") do
38
45
  end
39
46
 
40
47
  current_path.should == dashboard_url
48
+ event_email.should == 'spec@domain.tld'
41
49
  end
42
50
 
43
- it("A user should exist") do
44
- index_url = Users::Controller::Users.r(:index).to_s
45
- message = lang('users.messages.no_users')
51
+ it('Find an existing user') do
52
+ message = lang('users.messages.no_users')
46
53
 
47
54
  visit(index_url)
48
55
 
49
- page.has_selector?('table tbody tr').should === true
50
- page.has_content?(message).should === false
56
+ page.has_selector?('table tbody tr').should == true
57
+ page.has_content?(message).should == false
51
58
  end
52
59
 
53
60
  it("Create a new user") do
54
- index_url = Users::Controller::Users.r(:index).to_s
55
- save_button = lang('users.buttons.save')
56
- new_button = lang('users.buttons.new')
57
- status = lang('users.special.status_hash.open')
58
-
59
61
  visit(index_url)
60
62
  click_link(new_button)
61
63
 
@@ -63,59 +65,166 @@ describe("Users::Controller::Users") do
63
65
  fill_in('name' , :with => 'Spec user')
64
66
  fill_in('email' , :with => 'spec@email.com')
65
67
  fill_in('website', :with => 'spec.com')
66
- fill_in('new_password' , :with => 'spec')
68
+ fill_in('password' , :with => 'spec')
67
69
  fill_in('confirm_password', :with => 'spec')
68
- select(status, :from => 'status')
70
+
71
+ select(status, :from => 'user_status_id')
69
72
  click_on(save_button)
70
73
  end
71
74
 
72
- page.find('input[name="name"]').value.should === 'Spec user'
73
- page.find('input[name="email"]').value.should === 'spec@email.com'
75
+ page.has_selector?('span.error').should == false
76
+ page.find('input[name="name"]').value.should == 'Spec user'
77
+ page.find('input[name="email"]').value.should == 'spec@email.com'
74
78
  end
75
79
 
76
- it("Edit an existing user") do
77
- index_url = Users::Controller::Users.r(:index).to_s
78
- save_button = lang('users.buttons.save')
80
+ it('Search for a user') do
81
+ search_button = lang('zen_general.buttons.search')
82
+ error = lang('zen_general.errors.invalid_search')
83
+
84
+ visit(index_url)
85
+
86
+ within('#search_form') do
87
+ fill_in('query', :with => 'Spec user')
88
+ click_on(search_button)
89
+ end
90
+
91
+ page.has_content?(error).should == false
92
+ page.has_content?('Spec user').should == true
93
+
94
+ within('#search_form') do
95
+ fill_in('query', :with => 'does not exist')
96
+ click_on(search_button)
97
+ end
98
+
99
+ page.has_content?(error).should == false
100
+ page.has_content?('Spec user').should == false
101
+ end
79
102
 
103
+ it("Edit an existing user") do
80
104
  visit(index_url)
81
- click_link('spec@email.com')
105
+ click_link('Spec user')
82
106
 
83
107
  within('#user_form') do
84
108
  fill_in('name', :with => 'Spec user modified')
109
+ check('permission_show_user')
85
110
  click_on(save_button)
86
111
  end
87
112
 
88
- page.find('input[name="name"]').value.should === 'Spec user modified'
113
+ page.find('#permission_show_user').checked?.should == 'checked'
114
+ page.find_field('name').value.should == 'Spec user modified'
89
115
  end
90
116
 
91
- it("Edit an existing user with invalid data") do
92
- index_url = Users::Controller::Users.r(:index).to_s
93
- save_button = lang('users.buttons.save')
117
+ it('Remove a permission from a user') do
118
+ visit(index_url)
119
+ click_link('Spec user')
94
120
 
121
+ within('#user_form') do
122
+ uncheck('permission_show_user')
123
+ click_on(save_button)
124
+ end
125
+
126
+ page.find('#permission_show_user').checked?.should != 'checked'
127
+ end
128
+
129
+ it("Edit an existing user with invalid data") do
95
130
  visit(index_url)
96
- click_link('spec@email.com')
131
+ click_link('Spec user')
97
132
 
98
133
  within('#user_form') do
99
- fill_in('name', :with => '')
134
+ fill_in('form_name', :with => '')
100
135
  click_on(save_button)
101
136
  end
102
137
 
103
- page.has_selector?('label[for="form_name"] span.error').should === true
138
+ page.find_field('form_name').value.empty?.should == true
139
+ page.has_selector?('label[for="form_name"] span.error').should == true
104
140
  end
105
141
 
106
142
  it("Delete an existing user without specifying an ID") do
107
- index_url = Users::Controller::Users.r(:index).to_s
108
- delete_button = lang('users.buttons.delete')
109
-
110
143
  visit(index_url)
111
144
  click_on(delete_button)
112
145
 
113
- page.has_selector?('input[name="user_ids[]"]').should === true
146
+ page.has_selector?('input[name="user_ids[]"]').should == true
114
147
  end
115
148
 
116
149
  it("Delete an existing user") do
117
- index_url = Users::Controller::Users.r(:index).to_s
118
- delete_button = lang('users.buttons.delete')
150
+ visit(index_url)
151
+
152
+ within('table tbody tr:last-child') do
153
+ check('user_ids[]')
154
+ end
155
+
156
+ click_on(delete_button)
157
+
158
+ page.has_content?('spec@email.com').should == false
159
+ end
160
+
161
+ it('Call the event new_user (before and after)') do
162
+ event_name = nil
163
+
164
+ Zen::Event.listen(:before_new_user) do |user|
165
+ user.name += ' with event'
166
+ end
167
+
168
+ Zen::Event.listen(:after_new_user) do |user|
169
+ event_name = user.name
170
+ end
171
+
172
+ visit(index_url)
173
+ click_on(new_button)
174
+
175
+ within('#user_form') do
176
+ fill_in('name' , :with => 'User')
177
+ fill_in('email' , :with => 'spec@email.com')
178
+ fill_in('website', :with => 'spec.com')
179
+ fill_in('password' , :with => 'spec')
180
+ fill_in('confirm_password', :with => 'spec')
181
+
182
+ click_on(save_button)
183
+ end
184
+
185
+ page.has_selector?('span.error').should == false
186
+ page.find('input[name="name"]').value.should == 'User with event'
187
+ event_name.should == 'User with event'
188
+
189
+ Zen::Event.delete(:before_new_user, :after_new_user)
190
+ end
191
+
192
+ it('Call the event edit_user (before and after)') do
193
+ event_name = nil
194
+
195
+ Zen::Event.listen(:before_edit_user) do |user|
196
+ user.name = 'User modified'
197
+ end
198
+
199
+ Zen::Event.listen(:after_edit_user) do |user|
200
+ event_name = user.name
201
+ end
202
+
203
+ visit(index_url)
204
+ click_on('User with event')
205
+
206
+ within('#user_form') do
207
+ click_on(save_button)
208
+ end
209
+
210
+ page.has_selector?('span.error').should == false
211
+ page.find('input[name="name"]').value.should == 'User modified'
212
+ event_name.should == 'User modified'
213
+
214
+ Zen::Event.delete(:before_edit_user, :after_edit_user)
215
+ end
216
+
217
+ it('Call the event delete_user (before and after)') do
218
+ event_name = nil
219
+ event_name2 = nil
220
+
221
+ Zen::Event.listen(:before_delete_user) do |user|
222
+ event_name = user.name
223
+ end
224
+
225
+ Zen::Event.listen(:after_delete_user) do |user|
226
+ event_name2 = user.name
227
+ end
119
228
 
120
229
  visit(index_url)
121
230
 
@@ -125,6 +234,42 @@ describe("Users::Controller::Users") do
125
234
 
126
235
  click_on(delete_button)
127
236
 
128
- page.has_content?('spec@email.com').should === false
237
+ page.has_content?('User modified').should == false
238
+ event_name.should == 'User modified'
239
+ event_name2.should == event_name
240
+
241
+ Zen::Event.delete(:before_delete_user, :after_delete_user)
129
242
  end
243
+
244
+ it('Register a new user') do
245
+ get_setting(:allow_registration).value = '1'
246
+
247
+ logout_path = Users::Controller::Users.r(:logout).to_s
248
+ login_path = Users::Controller::Users.r(:login).to_s
249
+ register_path = Users::Controller::Users.r(:register).to_s
250
+
251
+ visit(logout_path)
252
+ visit(register_path)
253
+
254
+ current_path.should == register_path
255
+
256
+ within('#register_form') do
257
+ fill_in('name', :with => 'New user')
258
+ fill_in('email', :with => 'test@test.com')
259
+ fill_in('password', :with => 'abc')
260
+ fill_in('confirm_password', :with => 'abc')
261
+ click_on(lang('users.buttons.register'))
262
+ end
263
+
264
+ page.has_selector?('span.error').should == false
265
+ current_path.should == login_path
266
+
267
+ user = Users::Model::User[:email => 'test@test.com']
268
+
269
+ user.nil?.should == false
270
+ user.user_status.name.should == 'closed'
271
+ end
272
+
273
+ capybara_login
274
+ Users::Model::User[:email => 'test@test.com'].destroy
130
275
  end
@@ -0,0 +1,29 @@
1
+ require File.expand_path('../../../../../helper', __FILE__)
2
+ require File.join(Zen::FIXTURES, 'package', 'users', 'helper', 'access')
3
+
4
+ describe('Ramaze::Helper::Access') do
5
+ behaves_like :capybara
6
+
7
+ visit(Users::Controller::Users.r(:logout).to_s)
8
+
9
+ it('Deny access to a method') do
10
+ visit('/admin/spec-access-helper/denied')
11
+
12
+ current_path.should == Users::Controller::Users.r(:login).to_s
13
+ page.body.include?('super secret page').should == false
14
+ end
15
+
16
+ it('Allow access to a list of methods') do
17
+ capybara_login
18
+
19
+ visit('/admin/spec-access-helper/allowed')
20
+
21
+ current_path.should == SpecAccessHelper.r(:allowed).to_s
22
+ page.body.include?('allowed').should == true
23
+
24
+ visit('/admin/spec-access-helper/allowed_1')
25
+
26
+ current_path.should == SpecAccessHelper.r(:allowed_1).to_s
27
+ page.body.include?('allowed').should == true
28
+ end
29
+ end
@@ -0,0 +1,46 @@
1
+ require File.expand_path('../../../../../helper', __FILE__)
2
+ require File.join(Zen::FIXTURES, 'package', 'users', 'helper', 'acl')
3
+
4
+ describe('Ramaze::Helper::ACL') do
5
+ behaves_like :capybara
6
+
7
+ visit(Users::Controller::Users.r(:logout).to_s)
8
+
9
+ # Update the permissions before logging in as they're cached in the session.
10
+ Users::Model::User[:email => 'spec@domain.tld'] \
11
+ .add_permission(:permission => 'spec_permission')
12
+
13
+ Users::Model::UserGroup[:slug => 'administrators'] \
14
+ .update(:super_group => false)
15
+
16
+ capybara_login
17
+
18
+ it('Allow for a permission') do
19
+ visit('/admin/spec-acl-helper')
20
+
21
+ page.has_content?('not allowed').should == false
22
+ page.has_content?('allowed').should == true
23
+ end
24
+
25
+ it('Deny for a missing permission') do
26
+ visit('/admin/spec-acl-helper/invalid')
27
+
28
+ page.has_content?('not allowed').should == true
29
+ end
30
+
31
+ it('Respond for a missing permission') do
32
+ visit('/admin/spec-acl-helper/respond_message')
33
+
34
+ page.has_content?(lang('zen_general.errors.not_authorized')).should == true
35
+ page.status_code.should == 403
36
+ end
37
+
38
+ Zen.database[:permissions] \
39
+ .filter(:permission => 'spec_permission') \
40
+ .delete
41
+
42
+ Users::Model::UserGroup[:slug => 'administrators'] \
43
+ .update(:super_group => true)
44
+
45
+ Ramaze::Cache.session.clear
46
+ end
@@ -3,95 +3,51 @@ require File.expand_path('../../../../../helper', __FILE__)
3
3
  describe('Ramaze::Helper::Users') do
4
4
  behaves_like :capybara
5
5
 
6
- it('Create the test data') do
7
- @user = Users::Model::User.create(
8
- :email => 'spec@spec.com',
9
- :name => 'Spec user',
10
- :password => 'password'
11
- )
12
-
13
- @group = Users::Model::UserGroup.create(
14
- :name => 'Spec user group',
15
- :super_group => true
16
- )
17
-
18
- @rule = Users::Model::AccessRule.create(
19
- :package => 'sections',
20
- :controller => '*',
21
- :create_access => true,
22
- :read_access => true,
23
- :delete_access => true,
24
- :update_access => true,
25
- :user_id => @user.id
26
- )
27
-
28
- @user.email.should === 'spec@spec.com'
29
- @group.name.should === 'Spec user group'
30
- @rule.package.should === 'sections'
31
- @rule.user_id.should === @user.id
32
- end
6
+ user = Users::Model::User.create(
7
+ :email => 'spec@spec.com',
8
+ :name => 'Spec user',
9
+ :password => 'password'
10
+ )
11
+
12
+ group = Users::Model::UserGroup.create(
13
+ :name => 'Spec user group',
14
+ :super_group => true
15
+ )
33
16
 
34
17
  it('Validate a valid user') do
35
- url = Users::Controller::Users.r(:edit, @user.id).to_s
18
+ url = Users::Controller::Users.r(:edit, user.id).to_s
36
19
 
37
20
  visit(url)
38
21
 
39
- current_path.should === url
22
+ current_path.should == url
40
23
  end
41
24
 
42
25
  it('Validate an invalid user') do
43
- url = Users::Controller::Users.r(:edit, @user.id + 1).to_s
26
+ url = Users::Controller::Users.r(:edit, user.id + 1).to_s
44
27
  index = Users::Controller::Users.r(:index).to_s
45
28
 
46
29
  visit(url)
47
30
 
48
- current_path.should === index
31
+ current_path.should == index
49
32
  end
50
33
 
51
34
  it('Validate a valid user group') do
52
- url = Users::Controller::UserGroups.r(:edit, @group.id).to_s
35
+ url = Users::Controller::UserGroups.r(:edit, group.id).to_s
53
36
 
54
37
  visit(url)
55
38
 
56
- current_path.should === url
39
+ current_path.should == url
57
40
  end
58
41
 
59
42
  it('Validate an invalid user group') do
60
- url = Users::Controller::UserGroups.r(:edit, @group.id + 1).to_s
43
+ url = Users::Controller::UserGroups.r(:edit, group.id + 1).to_s
61
44
  index = Users::Controller::UserGroups.r(:index).to_s
62
45
 
63
46
  visit(url)
64
47
 
65
- current_path.should === index
66
- end
67
-
68
- it('Validate a valid access rule') do
69
- url = Users::Controller::AccessRules.r(:edit, @rule.id).to_s
70
-
71
- visit(url)
72
-
73
- current_path.should === url
74
- end
75
-
76
- it('Validate an invalid access rule') do
77
- url = Users::Controller::AccessRules.r(:edit, @rule.id + 1).to_s
78
- index = Users::Controller::AccessRules.r(:index).to_s
79
-
80
- visit(url)
81
-
82
- current_path.should === index
83
- end
84
-
85
- it('Delete the test data') do
86
- id = @user.id
87
-
88
- @rule.destroy
89
- @group.destroy
90
- @user.destroy
91
-
92
- Users::Model::User[:name => 'Spec user'].should === nil
93
- Users::Model::UserGroup[:name => 'Spec user group'].should === nil
94
- Users::Model::AccessRule[:user_id => id].should === nil
48
+ current_path.should == index
95
49
  end
96
50
 
51
+ group.destroy
52
+ user.destroy
97
53
  end