typus 1.0.0.pre8 → 1.0.0.pre9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (247) hide show
  1. data/CHANGELOG +4 -6
  2. data/Gemfile +16 -13
  3. data/Gemfile.lock +26 -2
  4. data/Rakefile +2 -3
  5. data/app/controllers/admin/base_controller.rb +3 -5
  6. data/app/controllers/admin/resources_controller.rb +24 -26
  7. data/app/helpers/admin/base_helper.rb +14 -22
  8. data/app/helpers/admin/dashboard_helper.rb +2 -5
  9. data/app/helpers/admin/filters_helper.rb +6 -8
  10. data/app/helpers/admin/form_helper.rb +3 -9
  11. data/app/helpers/admin/preview_helper.rb +4 -6
  12. data/app/helpers/admin/relationships_helper.rb +9 -11
  13. data/app/helpers/admin/resources_helper.rb +6 -24
  14. data/app/helpers/admin/search_helper.rb +1 -1
  15. data/app/helpers/admin/sidebar_helper.rb +12 -15
  16. data/app/helpers/admin/table_helper.rb +13 -13
  17. data/app/views/admin/dashboard/show.html.erb +1 -1
  18. data/app/views/admin/helpers/_apps.html.erb +4 -3
  19. data/app/views/admin/helpers/_header.html.erb +2 -2
  20. data/app/views/admin/helpers/dashboard/_applications.html.erb +3 -3
  21. data/app/views/admin/helpers/dashboard/_resources.html.erb +17 -13
  22. data/app/views/admin/helpers/filters/_filters.html.erb +9 -27
  23. data/app/views/admin/helpers/resources/_pagination.html.erb +8 -9
  24. data/app/views/admin/helpers/search/_search.html.erb +1 -1
  25. data/app/views/admin/mailer/reset_password_link.text.erb +3 -0
  26. data/app/views/admin/resources/_form.html.erb +4 -4
  27. data/app/views/admin/resources/edit.html.erb +2 -3
  28. data/app/views/admin/resources/index.html.erb +15 -13
  29. data/app/views/admin/resources/new.html.erb +2 -2
  30. data/app/views/admin/resources/show.html.erb +1 -2
  31. data/app/views/admin/templates/_boolean.html.erb +1 -1
  32. data/app/views/admin/templates/_has_many.html.erb +2 -4
  33. data/app/views/admin/templates/_has_n.html.erb +1 -1
  34. data/app/views/admin/templates/_selector.html.erb +0 -1
  35. data/app/views/admin/templates/_string.html.erb +1 -1
  36. data/app/views/layouts/admin/session.html.erb +1 -1
  37. data/config/available_locales/ca.yml +3 -5
  38. data/config/available_locales/de.yml +2 -4
  39. data/config/available_locales/es.yml +2 -4
  40. data/config/available_locales/fr.yml +40 -39
  41. data/config/available_locales/fr_models.yml +2 -2
  42. data/config/available_locales/hu.yml +3 -5
  43. data/config/available_locales/it.yml +0 -4
  44. data/config/available_locales/language.yml.template +2 -4
  45. data/config/available_locales/pt-BR.yml +2 -4
  46. data/config/available_locales/ru.yml +2 -4
  47. data/config/routes.rb +1 -0
  48. data/lib/generators/templates/config/initializers/typus.rb +5 -5
  49. data/lib/generators/templates/config/initializers/typus_authentication.rb +5 -5
  50. data/lib/generators/templates/config/initializers/typus_resources.rb +7 -7
  51. data/lib/generators/templates/config/typus/README +11 -13
  52. data/lib/generators/templates/controller.rb +0 -2
  53. data/lib/generators/templates/functional_test.rb +4 -15
  54. data/lib/generators/typus/migration_generator.rb +0 -1
  55. data/lib/support/active_record.rb +18 -9
  56. data/lib/support/fake_user.rb +42 -0
  57. data/lib/support/object.rb +1 -0
  58. data/lib/support/string.rb +0 -32
  59. data/lib/tasks/typus.rake +0 -8
  60. data/lib/typus.rb +34 -18
  61. data/lib/typus/authentication/base.rb +26 -0
  62. data/lib/typus/authentication/http_basic.rb +22 -0
  63. data/lib/typus/authentication/none.rb +19 -0
  64. data/lib/typus/authentication/session.rb +190 -0
  65. data/lib/typus/format.rb +12 -19
  66. data/lib/typus/orm/active_record.rb +13 -51
  67. data/lib/typus/resources.rb +0 -9
  68. data/lib/typus/version.rb +1 -1
  69. data/test/factories.rb +43 -0
  70. data/test/fixtures/rails_app/app/controllers/application_controller.rb +0 -1
  71. data/test/fixtures/rails_app/app/models/page.rb +0 -4
  72. data/test/fixtures/rails_app/config/application.rb +6 -3
  73. data/test/fixtures/rails_app/config/database.yml +12 -20
  74. data/test/fixtures/rails_app/config/typus/application.yml +4 -8
  75. data/test/fixtures/rails_app/db/test.sqlite3 +0 -0
  76. data/test/fixtures/rails_app/log/test.log +227115 -0
  77. data/test/fixtures/rails_app/tmp/export-posts-20101012213057.csv +2 -0
  78. data/test/fixtures/rails_app/tmp/export-posts-20101012213132.csv +2 -0
  79. data/test/fixtures/rails_app/tmp/export-posts-20101012213234.csv +2 -0
  80. data/test/fixtures/rails_app/tmp/export-posts-20101012213506.csv +2 -0
  81. data/test/fixtures/rails_app/tmp/export-posts-20101012215057.csv +2 -0
  82. data/test/fixtures/rails_app/tmp/export-posts-20101012215217.csv +2 -0
  83. data/test/fixtures/rails_app/tmp/export-posts-20101012215415.csv +2 -0
  84. data/test/fixtures/rails_app/tmp/export-posts-20101012215443.csv +2 -0
  85. data/test/fixtures/rails_app/tmp/export-posts-20101012215509.csv +2 -0
  86. data/test/fixtures/rails_app/tmp/export-posts-20101012215528.csv +2 -0
  87. data/test/fixtures/rails_app/tmp/export-posts-20101012215551.csv +2 -0
  88. data/test/fixtures/rails_app/tmp/export-posts-20101012215615.csv +2 -0
  89. data/test/fixtures/rails_app/tmp/export-posts-20101012215640.csv +2 -0
  90. data/test/fixtures/rails_app/tmp/export-posts-20101012215714.csv +2 -0
  91. data/test/fixtures/rails_app/tmp/export-posts-20101012215744.csv +2 -0
  92. data/test/fixtures/rails_app/tmp/export-posts-20101012215814.csv +2 -0
  93. data/test/fixtures/rails_app/tmp/export-posts-20101012215836.csv +2 -0
  94. data/test/fixtures/rails_app/tmp/export-posts-20101012215906.csv +2 -0
  95. data/test/fixtures/rails_app/tmp/export-posts-20101012220659.csv +2 -0
  96. data/test/fixtures/rails_app/tmp/export-posts-20101012221043.csv +2 -0
  97. data/test/fixtures/rails_app/tmp/export-posts-20101012221258.csv +2 -0
  98. data/test/fixtures/rails_app/tmp/export-posts-20101012222558.csv +2 -0
  99. data/test/fixtures/rails_app/tmp/export-posts-20101012222752.csv +2 -0
  100. data/test/fixtures/rails_app/tmp/export-posts-20101012222848.csv +2 -0
  101. data/test/fixtures/rails_app/tmp/export-posts-20101012223433.csv +2 -0
  102. data/test/fixtures/rails_app/tmp/export-posts-20101012223535.csv +2 -0
  103. data/test/fixtures/rails_app/tmp/export-posts-20101012224003.csv +2 -0
  104. data/test/fixtures/rails_app/tmp/export-posts-20101012224052.csv +2 -0
  105. data/test/fixtures/rails_app/tmp/export-posts-20101012224109.csv +2 -0
  106. data/test/fixtures/rails_app/tmp/export-posts-20101012224139.csv +2 -0
  107. data/test/fixtures/rails_app/tmp/export-posts-20101012224205.csv +2 -0
  108. data/test/fixtures/rails_app/tmp/export-posts-20101012224243.csv +2 -0
  109. data/test/fixtures/rails_app/tmp/export-posts-20101012225119.csv +2 -0
  110. data/test/fixtures/rails_app/tmp/export-posts-20101013063215.csv +2 -0
  111. data/test/fixtures/rails_app/tmp/export-posts-20101013063300.csv +2 -0
  112. data/test/fixtures/rails_app/tmp/export-posts-20101013063352.csv +2 -0
  113. data/test/fixtures/rails_app/tmp/export-posts-20101013063427.csv +2 -0
  114. data/test/fixtures/rails_app/tmp/export-posts-20101013063448.csv +2 -0
  115. data/test/fixtures/rails_app/tmp/export-posts-20101013063530.csv +2 -0
  116. data/test/fixtures/rails_app/tmp/export-posts-20101013063559.csv +2 -0
  117. data/test/fixtures/rails_app/tmp/export-posts-20101013063646.csv +2 -0
  118. data/test/fixtures/rails_app/tmp/export-posts-20101013063737.csv +2 -0
  119. data/test/fixtures/rails_app/tmp/export-posts-20101013063822.csv +2 -0
  120. data/test/fixtures/rails_app/tmp/export-posts-20101013063837.csv +2 -0
  121. data/test/fixtures/rails_app/tmp/export-posts-20101013063919.csv +2 -0
  122. data/test/fixtures/rails_app/tmp/export-posts-20101013063939.csv +2 -0
  123. data/test/fixtures/rails_app/tmp/export-posts-20101013063952.csv +2 -0
  124. data/test/fixtures/rails_app/tmp/export-posts-20101013064220.csv +2 -0
  125. data/test/fixtures/rails_app/tmp/export-posts-20101013064253.csv +2 -0
  126. data/test/fixtures/rails_app/tmp/export-posts-20101013064318.csv +2 -0
  127. data/test/fixtures/rails_app/tmp/export-posts-20101013064404.csv +2 -0
  128. data/test/fixtures/rails_app/tmp/export-posts-20101013064452.csv +2 -0
  129. data/test/fixtures/rails_app/tmp/export-posts-20101013064536.csv +2 -0
  130. data/test/fixtures/rails_app/tmp/export-posts-20101013064652.csv +2 -0
  131. data/test/fixtures/rails_app/tmp/export-posts-20101013064845.csv +2 -0
  132. data/test/fixtures/rails_app/tmp/export-posts-20101013065023.csv +2 -0
  133. data/test/fixtures/rails_app/tmp/export-posts-20101013065137.csv +2 -0
  134. data/test/fixtures/rails_app/tmp/export-posts-20101013065713.csv +2 -0
  135. data/test/fixtures/rails_app/tmp/export-posts-20101013065954.csv +2 -0
  136. data/test/fixtures/rails_app/tmp/export-posts-20101013070057.csv +2 -0
  137. data/test/fixtures/rails_app/tmp/export-posts-20101013070116.csv +2 -0
  138. data/test/fixtures/rails_app/tmp/export-posts-20101013070156.csv +2 -0
  139. data/test/fixtures/rails_app/tmp/export-posts-20101013070349.csv +2 -0
  140. data/test/fixtures/rails_app/tmp/export-posts-20101013070429.csv +2 -0
  141. data/test/fixtures/rails_app/tmp/export-posts-20101013070448.csv +2 -0
  142. data/test/fixtures/rails_app/tmp/export-posts-20101013070514.csv +2 -0
  143. data/test/fixtures/rails_app/tmp/export-posts-20101013070709.csv +2 -0
  144. data/test/fixtures/rails_app/tmp/export-posts-20101013070745.csv +2 -0
  145. data/test/fixtures/rails_app/tmp/export-posts-20101013070809.csv +2 -0
  146. data/test/fixtures/rails_app/tmp/export-posts-20101013070905.csv +2 -0
  147. data/test/fixtures/rails_app/tmp/export-posts-20101013070955.csv +2 -0
  148. data/test/fixtures/rails_app/tmp/export-posts-20101013071116.csv +2 -0
  149. data/test/fixtures/rails_app/tmp/export-posts-20101013071209.csv +2 -0
  150. data/test/fixtures/rails_app/tmp/export-posts-20101013071335.csv +2 -0
  151. data/test/fixtures/rails_app/tmp/export-posts-20101013071632.csv +2 -0
  152. data/test/fixtures/rails_app/tmp/export-posts-20101013071643.csv +2 -0
  153. data/test/fixtures/rails_app/tmp/export-posts-20101013071735.csv +2 -0
  154. data/test/fixtures/rails_app/tmp/export-posts-20101013071749.csv +2 -0
  155. data/test/fixtures/rails_app/tmp/export-posts-20101013072030.csv +2 -0
  156. data/test/fixtures/rails_app/tmp/export-posts-20101013072050.csv +2 -0
  157. data/test/fixtures/rails_app/tmp/export-posts-20101013072108.csv +2 -0
  158. data/test/fixtures/rails_app/tmp/export-posts-20101013072713.csv +2 -0
  159. data/test/fixtures/rails_app/tmp/export-posts-20101013072751.csv +2 -0
  160. data/test/fixtures/rails_app/tmp/export-posts-20101013072912.csv +2 -0
  161. data/test/fixtures/rails_app/tmp/export-posts-20101013074546.csv +2 -0
  162. data/test/fixtures/rails_app/tmp/export-posts-20101018180512.csv +2 -0
  163. data/test/fixtures/rails_app/tmp/export-posts-20101018183359.csv +2 -0
  164. data/test/fixtures/rails_app/tmp/export-posts-20101018183608.csv +2 -0
  165. data/test/fixtures/rails_app/tmp/export-posts-20101018183759.csv +2 -0
  166. data/test/functional/admin/account_controller_test.rb +1 -1
  167. data/test/functional/admin/{resources_controller_assets_relationships.rb → assets_controller_test.rb} +12 -16
  168. data/test/functional/admin/categories_controller_test.rb +62 -0
  169. data/test/functional/admin/{resources_controller_comments_toggle_test.rb → comments_controller_test.rb} +0 -0
  170. data/test/functional/admin/dashboard_controller_test.rb +34 -2
  171. data/test/functional/admin/posts_controller_test.rb +548 -0
  172. data/test/functional/admin/session_controller_test.rb +2 -2
  173. data/test/functional/admin/{resources_controller_tableless_resource_test.rb → status_controller_test.rb} +0 -0
  174. data/test/functional/admin/{resources_controller_typus_users_test.rb → typus_users_controller_test.rb} +2 -2
  175. data/test/helpers/admin/base_helper_test.rb +35 -37
  176. data/test/helpers/admin/dashboard_helper_test.rb +4 -8
  177. data/test/helpers/admin/form_helper_test.rb +9 -34
  178. data/test/helpers/admin/resources_helper_test.rb +28 -16
  179. data/test/helpers/admin/sidebar_helper_test.rb +14 -27
  180. data/test/helpers/admin/table_helper_test.rb +24 -68
  181. data/test/integration/login_test.rb +13 -0
  182. data/test/integration_test_helper.rb +21 -0
  183. data/test/lib/support/active_record_test.rb +72 -21
  184. data/test/lib/support/array_test.rb +2 -6
  185. data/test/lib/support/string_test.rb +21 -30
  186. data/test/lib/typus/active_record_test.rb +162 -100
  187. data/test/lib/typus/resource_test.rb +2 -3
  188. data/test/lib/typus_test.rb +25 -22
  189. data/test/test_helper.rb +4 -17
  190. data/test/unit/admin/mailer_test.rb +2 -2
  191. data/test/unit/typus_user_roles_test.rb +23 -23
  192. data/test/unit/typus_user_test.rb +30 -24
  193. data/typus.gemspec +0 -1
  194. metadata +111 -60
  195. data/app/models/admin/fake_user.rb +0 -46
  196. data/lib/generators/templates/model.yml +0 -10
  197. data/lib/typus/authentication.rb +0 -241
  198. data/lib/vendor/paginator.rb +0 -143
  199. data/test/factories/assets.rb +0 -5
  200. data/test/factories/categories.rb +0 -3
  201. data/test/factories/comments.rb +0 -6
  202. data/test/factories/pages.rb +0 -5
  203. data/test/factories/pictures.rb +0 -7
  204. data/test/factories/posts.rb +0 -6
  205. data/test/factories/typus_users.rb +0 -8
  206. data/test/fixtures/rails_app/README +0 -244
  207. data/test/fixtures/rails_app/app/helpers/application_helper.rb +0 -2
  208. data/test/fixtures/rails_app/app/views/layouts/application.html.erb +0 -14
  209. data/test/fixtures/rails_app/config/environments/development.rb +0 -19
  210. data/test/fixtures/rails_app/config/environments/production.rb +0 -42
  211. data/test/fixtures/rails_app/config/initializers/acts_as_list.rb +0 -258
  212. data/test/fixtures/rails_app/config/initializers/acts_as_tree.rb +0 -98
  213. data/test/fixtures/rails_app/config/initializers/backtrace_silencers.rb +0 -7
  214. data/test/fixtures/rails_app/config/initializers/inflections.rb +0 -10
  215. data/test/fixtures/rails_app/config/initializers/mime_types.rb +0 -5
  216. data/test/fixtures/rails_app/config/locales/en.yml +0 -5
  217. data/test/fixtures/rails_app/db/seeds.rb +0 -7
  218. data/test/fixtures/rails_app/public/404.html +0 -26
  219. data/test/fixtures/rails_app/public/422.html +0 -26
  220. data/test/fixtures/rails_app/public/500.html +0 -26
  221. data/test/fixtures/rails_app/public/favicon.ico +0 -0
  222. data/test/fixtures/rails_app/public/images/rails.png +0 -0
  223. data/test/fixtures/rails_app/public/index.html +0 -279
  224. data/test/fixtures/rails_app/public/javascripts/application.js +0 -2
  225. data/test/fixtures/rails_app/public/javascripts/controls.js +0 -965
  226. data/test/fixtures/rails_app/public/javascripts/dragdrop.js +0 -974
  227. data/test/fixtures/rails_app/public/javascripts/effects.js +0 -1123
  228. data/test/fixtures/rails_app/public/javascripts/prototype.js +0 -4874
  229. data/test/fixtures/rails_app/public/javascripts/rails.js +0 -118
  230. data/test/fixtures/rails_app/public/robots.txt +0 -5
  231. data/test/fixtures/rails_app/script/rails +0 -9
  232. data/test/functional/admin/dashboard_controller_http_basic_test.rb +0 -24
  233. data/test/functional/admin/dashboard_controller_none_test.rb +0 -18
  234. data/test/functional/admin/resources_controller_categories_before_test.rb +0 -10
  235. data/test/functional/admin/resources_controller_categories_lists_test.rb +0 -44
  236. data/test/functional/admin/resources_controller_categories_views_test.rb +0 -10
  237. data/test/functional/admin/resources_controller_posts_before_test.rb +0 -10
  238. data/test/functional/admin/resources_controller_posts_crud_custom_test.rb +0 -27
  239. data/test/functional/admin/resources_controller_posts_crud_test.rb +0 -44
  240. data/test/functional/admin/resources_controller_posts_formats_test.rb +0 -39
  241. data/test/functional/admin/resources_controller_posts_forms_test.rb +0 -58
  242. data/test/functional/admin/resources_controller_posts_permissions_test.rb +0 -100
  243. data/test/functional/admin/resources_controller_posts_relationships_test.rb +0 -91
  244. data/test/functional/admin/resources_controller_posts_roles.rb +0 -52
  245. data/test/functional/admin/resources_controller_posts_views_test.rb +0 -143
  246. data/test/lib/vendor/paginator_test.rb +0 -141
  247. data/typus-1.0.0.pre7.gem +0 -0
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -0,0 +1,2 @@
1
+ title;status
2
+ Post;published
@@ -29,7 +29,7 @@ class Admin::AccountControllerTest < ActionController::TestCase
29
29
  end
30
30
 
31
31
  should "sign_up a valid email" do
32
- assert_difference "TypusUser.count" do
32
+ assert_difference('TypusUser.count') do
33
33
  post :create, :typus_user => { :email => "john@example.com" }
34
34
  end
35
35
 
@@ -11,21 +11,19 @@ class Admin::AssetsControllerTest < ActionController::TestCase
11
11
  get :new, { :back_to => "/admin/posts/#{@post.id}/edit",
12
12
  :resource => @post.class.name, :resource_id => @post.id }
13
13
 
14
- assert_select 'body div#flash' do
15
- assert_select 'p', "You're adding a new Asset to Post. Do you want to cancel it?"
16
- assert_select 'a', "Do you want to cancel it?"
17
- end
14
+ assert_select 'body div#flash', "You're adding a new Asset to Post. Do you want to cancel it?"
15
+ assert_select 'body div#flash a', "Do you want to cancel it?"
18
16
  end
19
17
 
20
18
  should "create a polymorphic relationship" do
21
- assert_difference('post_.assets.count') do
19
+ assert_difference('@post.assets.count') do
22
20
  post :create, { :back_to => "/admin/posts/edit/#{@post.id}",
23
21
  :resource => @post.class.name,
24
22
  :resource_id => @post.id }
25
23
  end
26
24
 
27
25
  assert_response :redirect
28
- assert_redirected_to '/admin/posts/edit/1#assets'
26
+ assert_redirected_to '/admin/posts/edit/1'
29
27
  assert_equal "Asset successfully assigned to Post.", flash[:notice]
30
28
  end
31
29
 
@@ -36,23 +34,21 @@ class Admin::AssetsControllerTest < ActionController::TestCase
36
34
  :back_to => "/admin/posts/#{@post.id}/edit",
37
35
  :resource => @post.class.name, :resource_id => @post.id }
38
36
 
39
- assert_select 'body div#flash' do
40
- assert_select 'p', "You're updating a Asset for Post. Do you want to cancel it?"
41
- assert_select 'a', "Do you want to cancel it?"
42
- end
37
+ assert_select 'body div#flash', "You're updating a Asset for Post. Do you want to cancel it?"
38
+ assert_select 'body div#flash a', "Do you want to cancel it?"
43
39
  end
44
40
 
45
41
  should "return to back_to url" do
46
- Typus::Resources.expects(:action_after_save).returns(:edit)
47
- asset = assets(:first)
42
+ asset = Factory(:asset)
43
+ back_to = "#assets"
48
44
 
49
- post :update, { :back_to => "/admin/posts/#{@post.id}/edit",
45
+ post :update, { :id => asset.id,
46
+ :back_to => back_to,
50
47
  :resource => @post.class.name,
51
- :resource_id => @post.id,
52
- :id => asset.id }
48
+ :resource_id => @post.id }
53
49
 
54
50
  assert_response :redirect
55
- assert_redirected_to '/admin/posts/1/edit#assets'
51
+ assert_redirected_to :action => "edit", :id => asset.id, :back_to => back_to
56
52
  assert_equal "Asset successfully updated.", flash[:notice]
57
53
  end
58
54