mercury-rails 0.3.1 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (203) hide show
  1. data/POST_INSTALL +15 -0
  2. data/{vendor → app}/assets/images/mercury/button.png +0 -0
  3. data/{vendor → app}/assets/images/mercury/close.png +0 -0
  4. data/app/assets/images/mercury/default-snippet.png +0 -0
  5. data/{vendor → app}/assets/images/mercury/loading-dark.gif +0 -0
  6. data/{vendor → app}/assets/images/mercury/loading-light.gif +0 -0
  7. data/{vendor → app}/assets/images/mercury/missing-image.png +0 -0
  8. data/{vendor → app}/assets/images/mercury/search-icon.png +0 -0
  9. data/{vendor → app}/assets/images/mercury/temp-logo.png +0 -0
  10. data/app/assets/images/mercury/toolbar/editable/buttons.png +0 -0
  11. data/app/assets/images/mercury/toolbar/primary/_expander.png +0 -0
  12. data/app/assets/images/mercury/toolbar/primary/_pressed.png +0 -0
  13. data/app/assets/images/mercury/toolbar/primary/action.png +0 -0
  14. data/app/assets/images/mercury/toolbar/primary/historypanel.png +0 -0
  15. data/app/assets/images/mercury/toolbar/primary/insertcharacter.png +0 -0
  16. data/app/assets/images/mercury/toolbar/primary/insertlink.png +0 -0
  17. data/app/assets/images/mercury/toolbar/primary/insertmedia.png +0 -0
  18. data/app/assets/images/mercury/toolbar/primary/inserttable.png +0 -0
  19. data/app/assets/images/mercury/toolbar/primary/inspectorpanel.png +0 -0
  20. data/app/assets/images/mercury/toolbar/primary/notespanel.png +0 -0
  21. data/app/assets/images/mercury/toolbar/primary/preview.png +0 -0
  22. data/app/assets/images/mercury/toolbar/primary/redo.png +0 -0
  23. data/app/assets/images/mercury/toolbar/primary/save.png +0 -0
  24. data/app/assets/images/mercury/toolbar/primary/snippetpanel.png +0 -0
  25. data/app/assets/images/mercury/toolbar/primary/undo.png +0 -0
  26. data/app/assets/images/mercury/toolbar/snippetable/buttons.png +0 -0
  27. data/{vendor → app}/assets/javascripts/mercury.js +4 -0
  28. data/{vendor → app}/assets/javascripts/mercury/dependencies/jquery-1.7.js +0 -0
  29. data/{vendor → app}/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js +0 -0
  30. data/{vendor → app}/assets/javascripts/mercury/dependencies/jquery.additions.js +0 -0
  31. data/{vendor → app}/assets/javascripts/mercury/dependencies/jquery.htmlClean.js +0 -0
  32. data/{vendor → app}/assets/javascripts/mercury/dependencies/liquidmetal.js +0 -0
  33. data/{vendor → app}/assets/javascripts/mercury/dependencies/showdown.js +0 -0
  34. data/{vendor → app}/assets/javascripts/mercury/dialog.js.coffee +0 -0
  35. data/{vendor → app}/assets/javascripts/mercury/dialogs/backcolor.js.coffee +0 -0
  36. data/{vendor → app}/assets/javascripts/mercury/dialogs/forecolor.js.coffee +0 -0
  37. data/{vendor → app}/assets/javascripts/mercury/dialogs/formatblock.js.coffee +0 -0
  38. data/{vendor → app}/assets/javascripts/mercury/dialogs/snippetpanel.js.coffee +0 -0
  39. data/{vendor → app}/assets/javascripts/mercury/dialogs/style.js.coffee +0 -0
  40. data/{vendor → app}/assets/javascripts/mercury/finalize.js.coffee +0 -0
  41. data/{vendor → app}/assets/javascripts/mercury/history_buffer.js.coffee +0 -0
  42. data/{vendor → app}/assets/javascripts/mercury/lightview.js.coffee +0 -0
  43. data/app/assets/javascripts/mercury/locales/ar.locale.js.coffee +207 -0
  44. data/{vendor → app}/assets/javascripts/mercury/locales/da.locale.js.coffee +7 -7
  45. data/{vendor → app}/assets/javascripts/mercury/locales/de.locale.js.coffee +0 -0
  46. data/{vendor → app}/assets/javascripts/mercury/locales/es.locale.js.coffee +0 -0
  47. data/{vendor → app}/assets/javascripts/mercury/locales/example.local.js.coffee +0 -0
  48. data/{vendor → app}/assets/javascripts/mercury/locales/fr.locale.js.coffee +0 -0
  49. data/{vendor → app}/assets/javascripts/mercury/locales/it.locale.js.coffee +0 -0
  50. data/{vendor → app}/assets/javascripts/mercury/locales/ko.local.js.coffee +0 -0
  51. data/{vendor → app}/assets/javascripts/mercury/locales/nl.locale.js.coffee +0 -0
  52. data/{vendor → app}/assets/javascripts/mercury/locales/pt.locale.js.coffee +0 -0
  53. data/{vendor → app}/assets/javascripts/mercury/locales/sv.local.js.coffee +0 -0
  54. data/{vendor → app}/assets/javascripts/mercury/locales/swedish_chef.locale.js.coffee +0 -0
  55. data/app/assets/javascripts/mercury/locales/zh.local.js.coffee +209 -0
  56. data/{vendor → app}/assets/javascripts/mercury/mercury.js.coffee +9 -1
  57. data/{vendor → app}/assets/javascripts/mercury/modal.js.coffee +0 -0
  58. data/{vendor → app}/assets/javascripts/mercury/modals/htmleditor.js.coffee +0 -0
  59. data/{vendor → app}/assets/javascripts/mercury/modals/insertcharacter.js.coffee +0 -0
  60. data/{vendor → app}/assets/javascripts/mercury/modals/insertlink.js.coffee +0 -0
  61. data/{vendor → app}/assets/javascripts/mercury/modals/insertmedia.js.coffee +0 -0
  62. data/{vendor → app}/assets/javascripts/mercury/modals/insertsnippet.js.coffee +1 -0
  63. data/{vendor → app}/assets/javascripts/mercury/modals/inserttable.js.coffee +0 -0
  64. data/{vendor → app}/assets/javascripts/mercury/native_extensions.js.coffee +0 -0
  65. data/{vendor → app}/assets/javascripts/mercury/page_editor.js.coffee +46 -19
  66. data/{vendor → app}/assets/javascripts/mercury/palette.js.coffee +0 -0
  67. data/{vendor → app}/assets/javascripts/mercury/panel.js.coffee +2 -2
  68. data/{vendor → app}/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee +2 -2
  69. data/{vendor → app}/assets/javascripts/mercury/plugins/save_as_xml/plugin.js +0 -0
  70. data/{vendor → app}/assets/javascripts/mercury/region.js.coffee +0 -0
  71. data/{vendor → app}/assets/javascripts/mercury/regions/editable.js.coffee +5 -5
  72. data/app/assets/javascripts/mercury/regions/image.js.coffee +114 -0
  73. data/{vendor → app}/assets/javascripts/mercury/regions/markupable.js.coffee +0 -0
  74. data/app/assets/javascripts/mercury/regions/simple.js.coffee +325 -0
  75. data/{vendor → app}/assets/javascripts/mercury/regions/snippetable.js.coffee +0 -0
  76. data/{vendor → app}/assets/javascripts/mercury/select.js.coffee +0 -0
  77. data/{vendor → app}/assets/javascripts/mercury/snippet.js.coffee +23 -7
  78. data/{vendor → app}/assets/javascripts/mercury/snippet_toolbar.js.coffee +16 -4
  79. data/{vendor → app}/assets/javascripts/mercury/statusbar.js.coffee +0 -0
  80. data/{vendor → app}/assets/javascripts/mercury/support/history.js +0 -0
  81. data/{vendor → app}/assets/javascripts/mercury/table_editor.js.coffee +0 -0
  82. data/{vendor → app}/assets/javascripts/mercury/toolbar.button.js.coffee +8 -8
  83. data/{vendor → app}/assets/javascripts/mercury/toolbar.button_group.js.coffee +0 -0
  84. data/{vendor → app}/assets/javascripts/mercury/toolbar.expander.js.coffee +0 -0
  85. data/{vendor → app}/assets/javascripts/mercury/toolbar.js.coffee +0 -0
  86. data/{vendor → app}/assets/javascripts/mercury/tooltip.js.coffee +0 -0
  87. data/{vendor → app}/assets/javascripts/mercury/uploader.js.coffee +35 -17
  88. data/{vendor → app}/assets/javascripts/mercury_loader.js +0 -0
  89. data/{vendor → app}/assets/javascripts/mercury_overrides.js +0 -0
  90. data/{vendor → app}/assets/stylesheets/mercury.css +0 -0
  91. data/{vendor → app}/assets/stylesheets/mercury/all_images.css.erb +0 -0
  92. data/app/assets/stylesheets/mercury/buttons.css +73 -0
  93. data/{vendor → app}/assets/stylesheets/mercury/dialog.css +13 -4
  94. data/app/assets/stylesheets/mercury/form.css +125 -0
  95. data/{vendor → app}/assets/stylesheets/mercury/lightview.css +0 -0
  96. data/app/assets/stylesheets/mercury/mercury.css +45 -0
  97. data/{vendor → app}/assets/stylesheets/mercury/modal.css +1 -1
  98. data/{vendor → app}/assets/stylesheets/mercury/statusbar.css +0 -0
  99. data/{vendor → app}/assets/stylesheets/mercury/toolbar.css +0 -0
  100. data/{vendor → app}/assets/stylesheets/mercury/tooltip.css +0 -0
  101. data/{vendor → app}/assets/stylesheets/mercury/uploader.css +0 -0
  102. data/{vendor → app}/assets/stylesheets/mercury_overrides.css +0 -0
  103. data/app/views/mercury/modals/character.html +1 -1
  104. data/app/views/mercury/modals/htmleditor.html +1 -1
  105. data/app/views/mercury/modals/link.html +1 -1
  106. data/app/views/mercury/modals/media.html +1 -1
  107. data/app/views/mercury/modals/table.html +1 -1
  108. data/app/views/mercury/snippets/example/options.html.erb +1 -1
  109. data/features/generators/authentication.feature +10 -0
  110. data/features/generators/images.feature +41 -0
  111. data/features/generators/install.feature +21 -0
  112. data/features/loading/loading.feature +4 -1
  113. data/features/loading/user_interface.feature +9 -7
  114. data/features/regions/editable/basic_editing.feature +27 -26
  115. data/features/regions/editable/inserting_links.feature +8 -7
  116. data/features/regions/editable/inserting_snippets.feature +7 -7
  117. data/features/regions/image/uploading_images.feature +0 -0
  118. data/features/regions/simple/basic_editing.feature +5 -0
  119. data/features/step_definitions/generator_steps.rb +27 -0
  120. data/features/step_definitions/mercury_steps.rb +1 -0
  121. data/features/support/aruba.rb +28 -0
  122. data/features/support/env.rb +12 -2
  123. data/features/support/mercury_contents.rb +2 -2
  124. data/lib/generators/mercury/install/authentication/authentication_generator.rb +15 -0
  125. data/lib/generators/mercury/install/images/images_generator.rb +44 -0
  126. data/{app/models/mercury/image.rb → lib/generators/mercury/install/images/templates/ar_paperclip_image.rb} +3 -1
  127. data/{db/migrate/20110526035601_create_mercury_images.rb → lib/generators/mercury/install/images/templates/ar_paperclip_image_migration.rb} +0 -0
  128. data/{app/controllers/mercury → lib/generators/mercury/install/images/templates}/images_controller.rb +0 -0
  129. data/lib/generators/mercury/install/{templates → images/templates}/mongoid_paperclip_image.rb +0 -0
  130. data/lib/generators/mercury/install/install_generator.rb +3 -20
  131. data/lib/mercury-rails.rb +1 -2
  132. data/lib/mercury/authentication.rb +1 -0
  133. data/lib/mercury/engine.rb +17 -0
  134. data/lib/mercury/rails.rb +4 -0
  135. data/lib/mercury/version.rb +3 -0
  136. data/spec/dummy/Rakefile +7 -0
  137. data/spec/dummy/app/assets/javascripts/application.js +15 -0
  138. data/spec/dummy/app/assets/stylesheets/application.css +13 -0
  139. data/spec/dummy/app/controllers/application_controller.rb +3 -0
  140. data/spec/dummy/app/helpers/application_helper.rb +2 -0
  141. data/spec/dummy/app/views/layouts/application.html.erb +14 -0
  142. data/spec/dummy/config.ru +4 -0
  143. data/spec/dummy/config/application.rb +57 -0
  144. data/spec/dummy/config/boot.rb +10 -0
  145. data/spec/dummy/config/database.example.yml +25 -0
  146. data/spec/dummy/config/database.travisci.yml +4 -0
  147. data/spec/dummy/config/environment.rb +5 -0
  148. data/spec/dummy/config/environments/development.rb +37 -0
  149. data/spec/dummy/config/environments/production.rb +67 -0
  150. data/spec/dummy/config/environments/test.rb +37 -0
  151. data/spec/dummy/config/evergreen.rb +47 -0
  152. data/spec/dummy/config/initializers/backtrace_silencers.rb +7 -0
  153. data/spec/dummy/config/initializers/inflections.rb +15 -0
  154. data/spec/dummy/config/initializers/mime_types.rb +5 -0
  155. data/spec/dummy/config/initializers/secret_token.rb +7 -0
  156. data/spec/dummy/config/initializers/session_store.rb +8 -0
  157. data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
  158. data/spec/dummy/config/locales/en.yml +5 -0
  159. data/spec/dummy/config/routes.rb +5 -0
  160. data/spec/dummy/public/404.html +26 -0
  161. data/spec/dummy/public/422.html +26 -0
  162. data/spec/dummy/public/500.html +25 -0
  163. data/spec/dummy/public/blank.html +1 -0
  164. data/spec/dummy/public/canvastest.html +103 -0
  165. data/spec/dummy/public/distro.html +349 -0
  166. data/spec/dummy/public/favicon.ico +0 -0
  167. data/spec/dummy/public/frame.html +15 -0
  168. data/spec/dummy/public/images/bunny.gif +0 -0
  169. data/spec/dummy/public/images/bunny2.jpg +0 -0
  170. data/spec/dummy/public/index.html +392 -0
  171. data/spec/dummy/public/prototype.js +6082 -0
  172. data/spec/dummy/script/rails +6 -0
  173. data/spec/javascripts/mercury/page_editor_spec.js.coffee +55 -16
  174. data/spec/javascripts/mercury/panel_spec.js.coffee +2 -4
  175. data/spec/javascripts/mercury/regions/image_spec.js.coffee +34 -0
  176. data/spec/javascripts/mercury/regions/simple_spec.js.coffee +33 -0
  177. data/spec/javascripts/mercury/regions/snippetable_spec.js.coffee +1 -1
  178. data/spec/javascripts/mercury/snippet_spec.js.coffee +27 -2
  179. data/spec/javascripts/mercury/snippet_toolbar_spec.js.coffee +20 -4
  180. data/spec/javascripts/mercury/toolbar.button_spec.js.coffee +30 -0
  181. data/spec/javascripts/mercury/uploader_spec.js.coffee +16 -0
  182. data/spec/javascripts/templates/mercury/regions/image.html +1 -0
  183. data/spec/javascripts/templates/mercury/regions/simple.html +3 -0
  184. metadata +310 -158
  185. data/config/engine.rb +0 -41
  186. data/vendor/assets/images/mercury/default-snippet.png +0 -0
  187. data/vendor/assets/images/mercury/toolbar/editable/buttons.png +0 -0
  188. data/vendor/assets/images/mercury/toolbar/primary/_expander.png +0 -0
  189. data/vendor/assets/images/mercury/toolbar/primary/_pressed.png +0 -0
  190. data/vendor/assets/images/mercury/toolbar/primary/historypanel.png +0 -0
  191. data/vendor/assets/images/mercury/toolbar/primary/insertcharacter.png +0 -0
  192. data/vendor/assets/images/mercury/toolbar/primary/insertlink.png +0 -0
  193. data/vendor/assets/images/mercury/toolbar/primary/insertmedia.png +0 -0
  194. data/vendor/assets/images/mercury/toolbar/primary/inserttable.png +0 -0
  195. data/vendor/assets/images/mercury/toolbar/primary/inspectorpanel.png +0 -0
  196. data/vendor/assets/images/mercury/toolbar/primary/notespanel.png +0 -0
  197. data/vendor/assets/images/mercury/toolbar/primary/preview.png +0 -0
  198. data/vendor/assets/images/mercury/toolbar/primary/redo.png +0 -0
  199. data/vendor/assets/images/mercury/toolbar/primary/save.png +0 -0
  200. data/vendor/assets/images/mercury/toolbar/primary/snippetpanel.png +0 -0
  201. data/vendor/assets/images/mercury/toolbar/primary/undo.png +0 -0
  202. data/vendor/assets/images/mercury/toolbar/snippetable/buttons.png +0 -0
  203. data/vendor/assets/stylesheets/mercury/mercury.css +0 -151
@@ -0,0 +1,45 @@
1
+ /*
2
+ *= require_self
3
+ *= require ./form
4
+ *= require ./dialog
5
+ *= require ./lightview
6
+ *= require ./modal
7
+ *= require ./statusbar
8
+ *= require ./toolbar
9
+ *= require ./tooltip
10
+ *= require ./uploader
11
+ *= require ./buttons
12
+ *= require ./all_images
13
+ */
14
+
15
+ /*
16
+ * General Layout
17
+ *---------------------------------------------------------------------------*/
18
+
19
+ /* Disable text sizing in webkit (ipad/iphone etc -- should apply to mercury only) */
20
+ html {
21
+ -webkit-text-size-adjust: none;
22
+ }
23
+
24
+ html, body {
25
+ -webkit-transition: -webkit-transform 3s;
26
+ margin: 0;
27
+ padding: 0;
28
+ overflow: hidden;
29
+ }
30
+
31
+ .mercury-iframe {
32
+ position: absolute;
33
+ top: 0;
34
+ width: 100%;
35
+ visibility: hidden;
36
+ }
37
+ .mercury-focusable {
38
+ position: absolute;
39
+ opacity: 0;
40
+ }
41
+
42
+ .filter {
43
+ margin: 0;
44
+ padding: 0;
45
+ }
@@ -10,7 +10,7 @@
10
10
  height: 100%;
11
11
  opacity: 0;
12
12
  display: none;
13
- background: rgba(0,0,0, .65);
13
+ background: rgba(255,255,255, .8);
14
14
  }
15
15
  .mercury-modal {
16
16
  position: fixed;
@@ -1,4 +1,4 @@
1
- <form id="mercury_character" style="width:456px">
1
+ <form id="mercury_character" class="mercury-form" style="width:456px">
2
2
 
3
3
  <div class="mercury-display-pane-container">
4
4
  <div class="mercury-display-pane">
@@ -1,4 +1,4 @@
1
- <form id="mercury_html_editor" style="width:650px">
1
+ <form id="mercury_html_editor" class="mercury-form" style="width:650px">
2
2
 
3
3
  <textarea class="mercury-display-pane-container" rows="5" style="width:100%"></textarea>
4
4
 
@@ -1,4 +1,4 @@
1
- <form id="mercury_link" style="width:600px">
1
+ <form id="mercury_link" class="mercury-form" style="width:600px">
2
2
 
3
3
  <div class="mercury-display-pane-container">
4
4
  <div class="mercury-display-pane">
@@ -1,4 +1,4 @@
1
- <form id="mercury_media" style="width:600px">
1
+ <form id="mercury_media" class="mercury-form" style="width:600px">
2
2
 
3
3
  <div class="mercury-display-pane-container">
4
4
  <div class="mercury-display-pane">
@@ -1,4 +1,4 @@
1
- <form id="mercury_table" style="width:700px">
1
+ <form id="mercury_table" class="mercury-form" style="width:700px">
2
2
 
3
3
  <div class="mercury-display-pane-container">
4
4
  <div class="mercury-display-pane">
@@ -1,4 +1,4 @@
1
- <%= form_for 'options', { :html => { :style => 'width:600px' } } do |f| %>
1
+ <%= form_for 'options', { :html => { :class => 'mercury-form', :style => 'width:600px' } } do |f| %>
2
2
 
3
3
  <div class="mercury-display-pane-container">
4
4
  <div class="mercury-display-pane">
@@ -0,0 +1,10 @@
1
+ Feature:
2
+ As a developer
3
+ In order to restrict editing using Mercury
4
+ I should be able to use a generator to setup my application
5
+
6
+ Scenario: I can install a basic authentication template
7
+ Given I have created a new rails application
8
+ When I successfully run `bundle exec rails generate mercury:install:authentication --trace`
9
+ Then the following files should exist:
10
+ | lib/mercury/authentication.rb |
@@ -0,0 +1,41 @@
1
+ Feature:
2
+ As a developer
3
+ In order to use image processing within Mercury
4
+ I should be able to use a generator to setup my application
5
+
6
+ Scenario: I can install the image processing files required for Mercury
7
+ Given I have created a new rails application
8
+ When I successfully run `bundle exec rails generate mercury:install:images --trace`
9
+ Then the following files should exist:
10
+ | app/controllers/mercury/images_controller.rb |
11
+ | app/models/mercury/image.rb |
12
+ And the file "app/models/mercury/image.rb" should contain "class Mercury::Image < ActiveRecord::Base"
13
+ And should have the migration "create_mercury_images.rb"
14
+ And the file "config/routes.rb" should contain:
15
+ """
16
+ namespace :mercury do
17
+ resources :images
18
+ end
19
+ """
20
+ And the file "Gemfile" should contain "gem 'paperclip'"
21
+
22
+ Scenario: I can install the image processing files required for Mercury using Mongoid
23
+ Given I have created a new rails application
24
+ When I successfully run `bundle exec rails generate mercury:install:images --orm mongoid --trace`
25
+ Then the following files should exist:
26
+ | app/controllers/mercury/images_controller.rb |
27
+ | app/models/mercury/image.rb |
28
+ And the file "app/models/mercury/image.rb" should contain:
29
+ """
30
+ class Mercury::Image
31
+ include Mongoid::Document
32
+ include Mongoid::Paperclip
33
+ """
34
+ And should not have the migration "create_mercury_images.rb"
35
+ And the file "config/routes.rb" should contain:
36
+ """
37
+ namespace :mercury do
38
+ resources :images
39
+ end
40
+ """
41
+ And the file "Gemfile" should contain "gem 'paperclip'"
@@ -0,0 +1,21 @@
1
+ Feature:
2
+ As a developer
3
+ In order to use Mercury
4
+ I should be able to use a generator to install configuration and overrides into my application
5
+
6
+ Scenario: I can install the Mercury configuration file
7
+ Given I have created a new rails application
8
+ When I run `bundle exec rails generate mercury:install --trace` interactively
9
+ And I type "N"
10
+ Then the following files should exist:
11
+ | app/assets/javascripts/mercury.js |
12
+ And the file "config/routes.rb" should contain "mount Mercury::Engine => '/'"
13
+
14
+ Scenario: I can install the configuration file and overrides
15
+ Given I have created a new rails application
16
+ When I successfully run `bundle exec rails generate mercury:install --full --trace`
17
+ Then the following files should exist:
18
+ | app/assets/javascripts/mercury.js |
19
+ | app/assets/stylesheets/mercury_overrides.css |
20
+ | app/views/layouts/mercury.html.erb |
21
+ And the file "config/routes.rb" should contain "mount Mercury::Engine => '/'"
@@ -18,5 +18,8 @@ Feature:
18
18
  Then I should see "Editable region" in the content frame
19
19
 
20
20
 
21
+ # Latest selenium webdriver seems to consider the lightview hidden
22
+ @use_hidden_elements
21
23
  Scenario: A user can expect to see the status bar
22
- Then I should see "Mercury Editor v0.3.0" within the statusbar
24
+ Then I should see "Mercury Editor v0.4.0" within the statusbar
25
+
@@ -7,12 +7,14 @@ Feature:
7
7
  Background:
8
8
  Given I am on an editable page
9
9
 
10
- Scenario: A user can expect all this!
10
+ # Scenario: A user can expect all this!
11
11
 
12
12
 
13
- # Scenario: A user can view and close the about dialog
13
+ # Latest selenium webdriver seems to consider the lightview hidden
14
+ @use_hidden_elements
15
+ Scenario: A user can view and close the about dialog
14
16
  When I click on the about the editor link
15
- Then I should see "Mercury Editor" within the lightview title
17
+ Then I should see "Mercury Editor" within the lightview window
16
18
  And I should see "Mercury Editor is an open source HTML5 WYSIWYG editor written in Coffeescript using jQuery. The project has been released under the MIT license." within the lightview window
17
19
  And I should see "Project Home" within the lightview window
18
20
  And I should see "Project Source" within the lightview window
@@ -22,7 +24,7 @@ Feature:
22
24
  And the lightview overlay should not be visible
23
25
 
24
26
 
25
- # Scenario: A user can open and close select dropdowns
27
+ Scenario: A user can open and close select dropdowns
26
28
  When I click on the formatblock editor dropdown
27
29
  Then the formatblock select should be visible
28
30
  And I should see "Heading 1 <h1>" within the formatblock select
@@ -32,7 +34,7 @@ Feature:
32
34
  And the formatblock select should not be visible
33
35
 
34
36
 
35
- # Scenario: A user can open and close palette dialogs
37
+ Scenario: A user can open and close palette dialogs
36
38
  When I click on the background color editor button
37
39
  Then the background color palette should be visible
38
40
 
@@ -41,7 +43,7 @@ Feature:
41
43
  And the background color palette should not be visible
42
44
 
43
45
 
44
- # Scenario: A user can open and close a panel
46
+ Scenario: A user can open and close a panel
45
47
  When I click on the "View History" button
46
48
  Then the history panel should be visible
47
49
  And I should see "Page Version History" within the history panel
@@ -50,7 +52,7 @@ Feature:
50
52
  Then the history panel should not be visible
51
53
 
52
54
 
53
- # Scenario: A user can open and close a modal window
55
+ Scenario: A user can open and close a modal window
54
56
  When I click on the "Insert Link" button
55
57
  Then the modal window should be visible
56
58
  And the modal overlay should be visible
@@ -8,10 +8,10 @@ Feature:
8
8
  Given I am on an editable page
9
9
  And the editor won't prompt when leaving the page
10
10
 
11
- Scenario: A user can expect all this!
11
+ # Scenario: A user can expect all this!
12
12
 
13
13
 
14
- # Scenario: A user can set and unset bold content
14
+ Scenario: A user can set and unset bold content
15
15
  Given the content of the editable region is simple content
16
16
  And I make a selection
17
17
 
@@ -22,7 +22,7 @@ Feature:
22
22
  Then the contents of the editable region should be "this is <span>simple</span> <b>content</b>"
23
23
 
24
24
 
25
- # Scenario: A user can italicize content
25
+ Scenario: A user can italicize content
26
26
  Given the content of the editable region is simple content
27
27
  And I make a selection
28
28
 
@@ -33,7 +33,7 @@ Feature:
33
33
  Then the contents of the editable region should be "this is <span>simple</span> <b>content</b>"
34
34
 
35
35
 
36
- # Scenario: A user can overline content
36
+ Scenario: A user can overline content
37
37
  Given the content of the editable region is simple content
38
38
  And I make a selection
39
39
 
@@ -42,7 +42,7 @@ Feature:
42
42
  # doesn't remove overlines
43
43
 
44
44
 
45
- # Scenario: A user can strikeout content
45
+ Scenario: A user can strikeout content
46
46
  Given the content of the editable region is simple content
47
47
  And I make a selection
48
48
 
@@ -52,7 +52,7 @@ Feature:
52
52
  When I click on the strikethrough editor button
53
53
  Then the contents of the editable region should be "this is <span>simple</span> <b>content</b>"
54
54
 
55
- # Scenario: A user can underline content
55
+ Scenario: A user can underline content
56
56
  Given the content of the editable region is simple content
57
57
  And I make a selection
58
58
 
@@ -63,7 +63,7 @@ Feature:
63
63
  Then the contents of the editable region should be "this is <span>simple</span> <b>content</b>"
64
64
 
65
65
 
66
- # Scenario: A user can make content superscript
66
+ Scenario: A user can make content superscript
67
67
  Given the content of the editable region is simple content
68
68
  And I make a selection
69
69
 
@@ -74,7 +74,7 @@ Feature:
74
74
  Then the contents of the editable region should be "this is <span>simple</span> <b>content</b>"
75
75
 
76
76
 
77
- # Scenario: A user can make content subscript
77
+ Scenario: A user can make content subscript
78
78
  Given the content of the editable region is simple content
79
79
  And I make a selection
80
80
 
@@ -85,25 +85,25 @@ Feature:
85
85
  Then the contents of the editable region should be "this is <span>simple</span> <b>content</b>"
86
86
 
87
87
 
88
- # Scenario: A user can justify content to the left, center, right, or fully justified
88
+ Scenario: A user can justify content to the left, center, right, or fully justified
89
89
  # firefox: this isn't possible on the first line due to a bug in gecko, so we have special content for it
90
90
  Given the content of the editable region has justifiable content
91
91
  And I make a selection
92
92
 
93
93
  When I click on the justify left editor button
94
- Then the contents of the editable region should be "<div>first line</div><br><div align='left'>this is <span>justifiable</span><b>content</b></div> "
94
+ Then the contents of the editable region should be "<div>first line</div><br><div align='left'>this is <span>justifiable</span><b>content</b></div>"
95
95
 
96
96
  When I click on the justify center editor button
97
- Then the contents of the editable region should be "<div>first line</div><br><div align='center'>this is <span>justifiable</span><b>content</b></div> "
97
+ Then the contents of the editable region should be "<div>first line</div><br><div align='center'>this is <span>justifiable</span><b>content</b></div>"
98
98
 
99
99
  When I click on the justify right editor button
100
- Then the contents of the editable region should be "<div>first line</div><br><div align='right'>this is <span>justifiable</span><b>content</b></div> "
100
+ Then the contents of the editable region should be "<div>first line</div><br><div align='right'>this is <span>justifiable</span><b>content</b></div>"
101
101
 
102
102
  When I click on the full justification editor button
103
- Then the contents of the editable region should be "<div>first line</div><br><div align='justify'>this is <span>justifiable</span><b>content</b></div> "
103
+ Then the contents of the editable region should be "<div>first line</div><br><div align='justify'>this is <span>justifiable</span><b>content</b></div>"
104
104
 
105
105
 
106
- # Scenario: A user can make an unordered list
106
+ Scenario: A user can make an unordered list
107
107
  Given the content of the editable region is simple content
108
108
  And I make a selection
109
109
 
@@ -112,7 +112,7 @@ Feature:
112
112
 
113
113
  # todo: we should test enter and tab, and shift+tab in advanced editing
114
114
 
115
- # Scenario: A user can make an ordered list
115
+ Scenario: A user can make an ordered list
116
116
  Given the content of the editable region is simple content
117
117
  And I make a selection
118
118
 
@@ -122,25 +122,25 @@ Feature:
122
122
  # todo: we should test enter and tab, and shift+tab in advanced editing
123
123
 
124
124
 
125
- # Scenario: A user can indent and outdent content
125
+ Scenario: A user can indent and outdent content
126
126
  # firefox: this isn't possible on the first line due to a bug in gecko, so we have special content for it
127
127
  Given the content of the editable region has justifiable content
128
128
  And I make a selection
129
129
 
130
130
  When I click on the indent editor button
131
- Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote> "
131
+ Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote>"
132
132
 
133
133
  When I click on the indent editor button
134
- Then the contents of the editable region should be "<div>first line</div><br><blockquote><blockquote>this is <span>justifiable</span><b>content</b></blockquote></blockquote> "
134
+ Then the contents of the editable region should be "<div>first line</div><br><blockquote><blockquote>this is <span>justifiable</span><b>content</b></blockquote></blockquote>"
135
135
 
136
136
  When I click on the outdent editor button
137
- Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote> "
137
+ Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote>"
138
138
 
139
139
  When I click on the outdent editor button
140
- Then the contents of the editable region should be "<div>first line</div><br>this is <span>justifiable</span><b>content</b> "
140
+ Then the contents of the editable region should be "<div>first line</div><br>this is <span>justifiable</span><b>content</b>"
141
141
 
142
142
 
143
- # Scenario: A user can insert horizontal rules
143
+ Scenario: A user can insert horizontal rules
144
144
  Given the content of the editable region is simple content
145
145
  And I make a selection
146
146
 
@@ -151,7 +151,7 @@ Feature:
151
151
  Then the contents of the editable region should be "this is&nbsp;<hr size='2' width='100%'><hr size='2' width='100%'> <b>content</b>"
152
152
 
153
153
 
154
- # Scenario: A user can clean/remove formatting on their selection
154
+ Scenario: A user can clean/remove formatting on their selection
155
155
  Given the content of the editable region has wrapped content
156
156
  And I make a selection
157
157
 
@@ -159,7 +159,7 @@ Feature:
159
159
  Then the contents of the editable region should be "this is wrapped content"
160
160
 
161
161
 
162
- # Scenario: A user can wrap content within predefined styles
162
+ Scenario: A user can wrap content within predefined styles
163
163
  Given the content of the editable region is simple content
164
164
  And I make a selection
165
165
 
@@ -168,7 +168,7 @@ Feature:
168
168
  Then the contents of the editable region should be "this is <span class='red'><span>simple</span></span> <b>content</b>"
169
169
 
170
170
 
171
- # Scenario: A user can wrap content in formatted block tags
171
+ Scenario: A user can wrap content in formatted block tags
172
172
  Given the content of the editable region is simple content
173
173
  And I make a selection
174
174
 
@@ -177,7 +177,7 @@ Feature:
177
177
  Then the contents of the editable region should be "<h2>this is <span>simple</span> <b>content</b></h2>"
178
178
 
179
179
 
180
- # Scenario: A user can set the background color of a selection
180
+ Scenario: A user can set the background color of a selection
181
181
  Given the content of the editable region is simple content
182
182
  And I make a selection
183
183
 
@@ -186,10 +186,11 @@ Feature:
186
186
  Then the contents of the editable region should be "this is <span style='background-color:#FF0000'><span>simple</span></span> <b>content</b>"
187
187
 
188
188
 
189
- # Scenario: A user can set the foreground color
189
+ Scenario: A user can set the foreground color
190
190
  Given the content of the editable region is simple content
191
191
  And I make a selection
192
192
 
193
193
  When I click on the foreground color editor palette
194
194
  And click on the color red
195
195
  Then the contents of the editable region should be "this is <font color='rgb(255, 0, 0)'><span>simple</span></font> <b>content</b>"
196
+
@@ -8,10 +8,10 @@ Feature:
8
8
  Given I am on an editable page
9
9
  And the editor won't prompt when leaving the page
10
10
 
11
- Scenario: A user can expect all this!
11
+ # Scenario: A user can expect all this!
12
12
 
13
13
 
14
- # Scenario: A user can insert and edit a link to an external site
14
+ Scenario: A user can insert and edit a link to an external site
15
15
  Given the content of the editable region is simple content
16
16
  And I make a selection
17
17
 
@@ -32,7 +32,7 @@ Feature:
32
32
  Then the contents of the editable region should be "this is <a href='http://cnn.com'>simple</a> <b>content</b>"
33
33
 
34
34
 
35
- # Scenario: A user can insert and edit a link with a target set
35
+ Scenario: A user can insert and edit a link with a target set
36
36
  Given the content of the editable region is simple content
37
37
  And I make a selection
38
38
 
@@ -48,7 +48,7 @@ Feature:
48
48
  Then the contents of the editable region should be "this is <a target='_top' href='http://google.com'>simple</a> <b>content</b>"
49
49
 
50
50
 
51
- # Scenario: A user can insert a link to an external site and open it in a popup
51
+ Scenario: A user can insert a link to an external site and open it in a popup
52
52
  Given the content of the editable region is simple content
53
53
  And I make a selection
54
54
 
@@ -65,7 +65,7 @@ Feature:
65
65
  And the "Popup Height" field should contain "200"
66
66
 
67
67
 
68
- # Scenario: A user can insert a bookmark and then link to it
68
+ Scenario: A user can insert a bookmark and then link to it
69
69
  Given the content of the editable region is simple content
70
70
  And I make a selection
71
71
 
@@ -94,5 +94,6 @@ Feature:
94
94
  # todo: when I change the name of a bookmark, and bookmarks that are pointing to me should also be updated (on this page)
95
95
 
96
96
 
97
- Scenario: A user can navigate links inside of regions
98
- # todo: finish
97
+ # Scenario: A user can navigate links inside of regions
98
+ # todo: finish
99
+