Permalink
Browse files

Merge branch 'master' of git://github.com/resolve/refinerycms

  • Loading branch information...
bofrede committed Sep 21, 2010
2 parents f70cd16 + e82c7f5 commit a4ed7d928661c636315c6bc7d16ab1c462415e5b
Showing with 593 additions and 298 deletions.
  1. +4 −0 .gitignore
  2. +11 −2 Gemfile
  3. +19 −17 Gemfile.lock
  4. +1 −2 bin/refinerycms
  5. +59 −2 changelog.md
  6. +13 −3 refinerycms.gemspec
  7. +8 −36 todo.md
  8. +2 −2 vendor/refinerycms/authentication/config/locales/en.yml
  9. +4 −4 vendor/refinerycms/authentication/config/locales/zh-CN.yml
  10. +2 −2 vendor/refinerycms/authentication/features/manage_users.feature
  11. +22 −12 vendor/refinerycms/core/app/views/layouts/application.html.erb
  12. +3 −3 vendor/refinerycms/core/app/views/shared/_content_page.html.erb
  13. +2 −2 vendor/refinerycms/core/app/views/shared/_draft_page_message.html.erb
  14. +1 −3 vendor/refinerycms/core/app/views/shared/_footer.html.erb
  15. +1 −1 vendor/refinerycms/core/app/views/shared/_google_analytics.html.erb
  16. +5 −7 vendor/refinerycms/core/app/views/shared/_head.html.erb
  17. +1 −3 vendor/refinerycms/core/app/views/shared/_header.html.erb
  18. +10 −4 vendor/refinerycms/core/app/views/shared/_html5_for_ie.js.erb
  19. +7 −3 vendor/refinerycms/core/app/views/shared/_menu.html.erb
  20. +6 −6 vendor/refinerycms/core/app/views/shared/_menu_branch.html.erb
  21. +5 −5 vendor/refinerycms/core/config/locales/en.yml
  22. +2 −2 vendor/refinerycms/core/config/locales/zh-CN.yml
  23. +21 −16 vendor/refinerycms/core/engines.md
  24. +3 −0 vendor/refinerycms/core/features/search.feature
  25. +1 −1 vendor/refinerycms/core/features/step_definitions/core_steps.rb
  26. +76 −0 vendor/refinerycms/core/lib/core.rb
  27. +5 −50 vendor/refinerycms/core/lib/generators/refinery_engine/refinery_engine_generator.rb
  28. +2 −2 ...cms/core/lib/generators/refinery_engine/templates/app/controllers/admin/plural_name_controller.rb
  29. +1 −3 ...or/refinerycms/core/lib/generators/refinery_engine/templates/app/views/plural_name/index.html.erb
  30. +2 −6 vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/plural_name/show.html.erb
  31. +4 −0 vendor/refinerycms/core/lib/generators/refinery_engine/templates/config/locales/en.yml
  32. 0 ...nery_engine/templates/db/migrate/{migration_number_create_plural_name.rb → create_plural_name.rb}
  33. +2 −2 vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/seeds/plural_name.rb
  34. +6 −0 ...core/lib/generators/refinery_engine/templates/lib/generators/refinerycms_plural_name_generator.rb
  35. +4 −0 vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/plural_name.rb
  36. +13 −0 vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/tasks/plural_name.rake
  37. 0 vendor/refinerycms/core/lib/generators/refinery_engine/templates/public/.gitkeep
  38. +10 −0 vendor/refinerycms/core/lib/generators/refinery_engine/templates/readme.md
  39. +9 −1 vendor/refinerycms/core/lib/refinery/crud.rb
  40. +5 −4 vendor/refinerycms/core/lib/refinery/helpers/image_helper.rb
  41. +1 −1 vendor/refinerycms/core/lib/refinery/helpers/site_bar_helper.rb
  42. +1 −1 vendor/refinerycms/core/public/javascripts/refinery/admin.js
  43. +17 −8 vendor/refinerycms/core/public/javascripts/wymeditor/jquery.refinery.wymeditor.js
  44. +2 −2 vendor/refinerycms/core/public/stylesheets/refinery/application.css
  45. +3 −3 vendor/refinerycms/core/public/stylesheets/refinery/formatting.css
  46. +2 −2 vendor/refinerycms/core/public/stylesheets/refinery/refinery.css
  47. +1 −1 vendor/refinerycms/dashboard/config/locales/en.yml
  48. +1 −1 vendor/refinerycms/dashboard/config/locales/zh-CN.yml
  49. +1 −1 vendor/refinerycms/dashboard/features/dashboard.feature
  50. +1 −1 vendor/refinerycms/images/app/controllers/admin/images_controller.rb
  51. +2 −2 vendor/refinerycms/images/config/locales/en.yml
  52. +2 −2 vendor/refinerycms/images/config/locales/zh-CN.yml
  53. +4 −4 vendor/refinerycms/images/features/manage_images.feature
  54. +23 −0 vendor/refinerycms/images/lib/images.rb
  55. +2 −1 vendor/refinerycms/pages/app/models/page.rb
  56. +6 −0 vendor/refinerycms/pages/app/views/admin/pages/_form.html.erb
  57. +1 −0 vendor/refinerycms/pages/app/views/admin/pages/_form_fields_after_title.html.erb
  58. +3 −3 vendor/refinerycms/pages/config/locales/en.yml
  59. +4 −4 vendor/refinerycms/pages/config/locales/ru.yml
  60. +2 −2 vendor/refinerycms/pages/config/locales/zh-CN.yml
  61. +7 −10 vendor/refinerycms/pages/config/routes.rb
  62. +5 −5 vendor/refinerycms/pages/features/manage_pages.feature
  63. +1 −0 vendor/refinerycms/pages/features/step_definitions/page_steps.rb
  64. +39 −5 vendor/refinerycms/pages/spec/models/page_spec.rb
  65. +6 −5 vendor/refinerycms/refinery.rb
  66. +1 −1 vendor/refinerycms/resources/features/manage_files.feature
  67. +23 −0 vendor/refinerycms/resources/lib/resources.rb
  68. +16 −12 vendor/refinerycms/settings/app/controllers/admin/refinery_settings_controller.rb
  69. +3 −0 vendor/refinerycms/settings/app/models/refinery_setting.rb
  70. +37 −14 vendor/refinerycms/settings/app/views/admin/refinery_settings/index.html.erb
  71. +1 −1 vendor/refinerycms/settings/config/locales/en.yml
  72. +9 −0 vendor/refinerycms/settings/features/step_definitions/setting_steps.rb
  73. +14 −0 vendor/refinerycms/settings/features/support/paths.rb
View
@@ -71,3 +71,7 @@ config/amazon_s3.yml
config/rackspace_cloudfiles.yml
# END REFINERY CMS DEVELOPMENT =================================================
+
+# sass
+.sass-cache
+.sass-cache/*
View
13 Gemfile
@@ -36,13 +36,13 @@ gem 'mysql', '2.8.1'
gem 'refinerycms', :path => '.'
# Specify additional Refinery CMS Engines here (all optional):
-gem 'refinerycms-inquiries', '~> 0.9.8.7'
+gem 'refinerycms-inquiries', '~> 0.9.8.8'
# gem 'refinerycms-news', '~> 0.9.9'
# gem 'refinerycms-portfolio', '~> 0.9.8'
# gem 'refinerycms-theming', '~> 0.9.8'
# Add i18n support (optional, you can remove this if you really want to).
-gem 'refinerycms-i18n', '~> 0.9.8.6', :require => 'refinery/i18n'
+gem 'refinerycms-i18n', '~> 0.9.8.7'
# Figure out how to get RMagick:
rmagick_options = {:require => false}
@@ -86,4 +86,13 @@ group :test do
gem 'autotest-notification'
end
+#===REFINERY END OF REQUIRED GEMS===
+
+#===REQUIRED FOR REFINERY GEM INSTALL===
+# Leave the gem below disabled (commented out) if you're not using the gem install method.
+# gem 'refinerycms', '~> 0.9.7.12'
+#===END OF REFINERY GEM INSTALL REQUIREMENTS===
+
+# Bundle gems for certain environments:
+
# END REFINERY CMS DEVELOPMENT =================================================
View
@@ -8,7 +8,7 @@ GIT
PATH
remote: .
specs:
- refinerycms (0.9.8.3)
+ refinerycms (0.9.8.5)
acts_as_indexed (~> 0.6.6)
authlogic (~> 2.1.6)
bundler (~> 1.0.0)
@@ -89,7 +89,7 @@ GEM
factory_girl (1.3.2)
ffi (0.6.3)
rake (>= 0.8.7)
- filters_spam (0.2)
+ filters_spam (0.3)
friendly_id (3.1.6)
babosa (~> 0.2.0)
gherkin (2.1.5)
@@ -99,7 +99,7 @@ GEM
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
- mail (2.2.5)
+ mail (2.2.6.1)
activesupport (>= 2.3.6)
mime-types
treetop (>= 1.4.5)
@@ -128,24 +128,26 @@ GEM
rake (>= 0.8.4)
thor (~> 0.14.0)
rake (0.8.7)
- refinerycms-i18n (0.9.8.6)
- refinerycms (~> 0.9.8)
+ refinerycms-i18n (0.9.8.7)
+ refinerycms (>= 0.9.8)
routing-filter (~> 0.1.6)
- refinerycms-inquiries (0.9.8.7)
+ refinerycms-inquiries (0.9.8.8)
filters_spam (~> 0.2)
rmagick (2.12.2)
routing-filter (0.1.6)
actionpack
- rspec (2.0.0.beta.20)
- rspec-core (= 2.0.0.beta.20)
- rspec-expectations (= 2.0.0.beta.20)
- rspec-mocks (= 2.0.0.beta.20)
- rspec-core (2.0.0.beta.20)
- rspec-expectations (2.0.0.beta.20)
+ rspec (2.0.0.beta.22)
+ rspec-core (= 2.0.0.beta.22)
+ rspec-expectations (= 2.0.0.beta.22)
+ rspec-mocks (= 2.0.0.beta.22)
+ rspec-core (2.0.0.beta.22)
+ rspec-expectations (2.0.0.beta.22)
diff-lcs (>= 1.1.2)
- rspec-mocks (2.0.0.beta.20)
- rspec-rails (2.0.0.beta.20)
- rspec (= 2.0.0.beta.20)
+ rspec-mocks (2.0.0.beta.22)
+ rspec-core (= 2.0.0.beta.22)
+ rspec-expectations (= 2.0.0.beta.22)
+ rspec-rails (2.0.0.beta.22)
+ rspec (= 2.0.0.beta.22)
ruby-prof (0.9.2)
rubyzip (0.9.4)
selenium-webdriver (0.0.28)
@@ -182,8 +184,8 @@ DEPENDENCIES
rack-test!
rails (~> 3.0.0)
refinerycms!
- refinerycms-i18n (~> 0.9.8.6)
- refinerycms-inquiries (~> 0.9.8.7)
+ refinerycms-i18n (~> 0.9.8.7)
+ refinerycms-inquiries (~> 0.9.8.8)
rmagick (~> 2.12.0)
rspec (~> 2.0.0.beta)
rspec-core (~> 2.0.0.beta)
View
@@ -14,7 +14,6 @@ end
require 'pathname'
require 'fileutils'
require 'optparse'
-require 'rbconfig'
# Load refinerycms
require Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")).join('vendor', 'refinerycms', 'refinery.rb')
@@ -241,7 +240,7 @@ module Refinery
to_run << "cd \"#{@app_path}\" &&" if options[:cd]
to_run << command
- if RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+ if Refinery::WINDOWS
to_run = %w(cmd /c) | to_run.map{|c| c.gsub(/\//m, '\\')}
end
View
@@ -1,8 +1,65 @@
+## 0.9.8.5 [21 September 2010](http://github.com/parndt)
+* Fixed an issue with the engine generator that was putting a comma in the wrong place breaking the call to ``crudify``. [Maarten Hoogendoorn](http://github.com/moretea)
+* Made the delete messages consistent. [Uģis Ozols](http://github.com/ugisozols)
+* ``zh-CN`` was overriding en locale in core locale file, fixed. [Philip Arndt](http://github.com/parndt)
+* Changed verbiage from created to added, create to add as it describes it better for things like images. [Philip Arndt](http://github.com/parndt)
+* ``image_fu`` no longer gives you the width and height of the image due to performance problems. [Philip Arndt](http://github.com/parndt) and [David Jones](http://github.com/djones)
+* Implemented a standardised API for the engine generator. The core now includes a standard engine install generator. Engines generate a readme file explaining how to build an engine as a gem. [David Jones](http://github.com/djones)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.4...0.9.8.5)
+
+## 0.9.8.4 [17 September 2010]
+* Recursive deletion of page parts. [primerano](http://github.com/primerano)
+* Move around the default pages. [Philip Arndt](http://github.com/parndt)
+* Extraction of windows check to ``Refinery::WINDOWS``. [Steven Heidel](http://github.com/stevenheidel)
+* Updated the changelog for several previous releases. [Steven Heidel](http://github.com/stevenheidel)
+* Made the menu more flexible so that it can be used in many places in your layout without caching over the top of itself. [Philip Arndt](http://github.com/parndt)
+* Added search feature to Refinery Settings. [Matt McMahand](http://github.com/invalidusrname)
+* Ensure that in ``crudify`` that we use ``:per_page`` properly for ``will_paginate``. [Philip Arndt](http://github.com/parndt)
+* Reduce the number of routes that we respond to in the ``pages`` engine as they were unused. [Philip Arndt](http://github.com/parndt)
+* Fixed a case where page links weren't generating properly when inside an engine such as the news engine which made use of ``params[:id]``. Took a lot of perserverance on the part of Hez - thank you very much Hez! [Hez Ronningen](http://github.com/hez) and [Philip Arndt](http://github.com/parndt)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.3...0.9.8.4)
+
+## 0.9.8.3 [14 September 2010]
+* German translation improvements. [Andre Lohan](http://github.com/dc5ala)
+* Fix bug with ``bin/refinerycms`` and windows commands. [Philip Arndt](http://github.com/parndt)
+* DRY up ``crudify`` and also switch to ARel. [Philip Arndt](http://github.com/parndt)
+* Several fixes to make things much easier on windows. [Philip Arndt](http://github.com/parndt)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.2...0.9.8.3)
+
+## 0.9.8.2 [13 September 2010]
+* Update ``readme.md`` [David Jones](http://github.com/djones)
+* Speed improvements to menu with nested_set. [Maarten Hoogendoorn](http://github.com/moretea)
+* More speed improvements by optimising slugs. [Philip Arndt](http://github.com/parndt)
+* Fix ``-h`` flag on ``bin/refinerycms`` to display the help. [Steven Heidel](http://github.com/stevenheidel)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.1...0.9.8.2)
+
+## 0.9.8.1 [9 September 2010]
+* Convert to ``awesome_nested_set``. [Maarten Hoogendoorn](http://github.com/moretea) and [Philip Arndt](http://github.com/parndt)
+* Allow passing ``-g`` to the bin task for extra gems. [Tomás Senart](http://github.com/tsenart)
+* Update documentation for engines, not plugins. [David Jones](http://github.com/djones)
+* Several more documentation fixes. [Steven Heidel](http://github.com/stevenheidel)
+* Better use of dragonfly resizing. [Philip Arndt](http://github.com/parndt)
+* Partial Latvian translation. [Uģis Ozols](http://github.com/ugisozols)
+* Review Portugese translation. [Kivanio Barbosa](http://github.com/kivanio)
+* Bugfix with wymeditor in the engine generator. [Karmen Blake](http://github.com/kblake)
+* Split ``application_helper`` into smaller, more usable files. [Philip Arndt](http://github.com/parndt)
+* Move features and specs to each engine directory. [Philip Arndt](http://github.com/parndt)
+* Bugfixes to ensure that reordering works under ``awesome_nested_set``. [Maarten Hoogendoorn](http://github.com/moretea) and [Philip Arndt](http://github.com/parndt)
+* Update engines to not have a special :require in the Gemfile. [Johan Bruning](http://github.com/GidoGeek)
+* Make cache sweepers work. [Philip Arndt](http://github.com/parndt)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8...0.9.8.1)
+
## 0.9.8 [30 August 2010]
-* Rails 3 support.
-* [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.13...0.9.8)
+* Rails 3 support!
+ - [Philip Arndt](http://github.com/parndt)
+ - [Alex Coles](http://github.com/myabc)
+ - [Steven Heidel](http://github.com/stevenheidel)
+ - [David Jones](http://github.com/djones)
+ - [Uģis Ozols](http://github.com/ugisozols)
+ - [Maarten Hoogendoorn](http://github.com/moretea)
* [See our blog post](http://refinerycms.com/blog/refinery-cms-supports-rails-3)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.13...0.9.8)
## 0.9.7.13 [23 August 2010]
View
@@ -2,9 +2,9 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
- s.version = %q{0.9.8.3}
+ s.version = %q{0.9.8.5}
s.description = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
- s.date = %q{2010-09-15}
+ s.date = %q{2010-09-21}
s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
@@ -277,11 +277,17 @@ Gem::Specification.new do |s|
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/config/routes.rb',
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/db',
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/migrate',
- 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/migrate/migration_number_create_plural_name.rb',
+ 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/migrate/create_plural_name.rb',
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/seeds',
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/seeds/plural_name.rb',
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib',
+ 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/generators',
+ 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/generators/refinerycms_plural_name_generator.rb',
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/plural_name.rb',
+ 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/tasks',
+ 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/tasks/plural_name.rake',
+ 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/public',
+ 'vendor/refinerycms/core/lib/generators/refinery_engine/templates/readme.md',
'vendor/refinerycms/core/lib/generators/refinery_engine/templates/refinerycms-plural_name.gemspec',
'vendor/refinerycms/core/lib/refinery',
'vendor/refinerycms/core/lib/refinery/activity.rb',
@@ -876,6 +882,7 @@ Gem::Specification.new do |s|
'vendor/refinerycms/pages/app/views/admin/pages/_form.html.erb',
'vendor/refinerycms/pages/app/views/admin/pages/_form_advanced_options.html.erb',
'vendor/refinerycms/pages/app/views/admin/pages/_form_advanced_options_seo.html.erb',
+ 'vendor/refinerycms/pages/app/views/admin/pages/_form_fields_after_title.html.erb',
'vendor/refinerycms/pages/app/views/admin/pages/_form_new_page_parts.html.erb',
'vendor/refinerycms/pages/app/views/admin/pages/_form_page_parts.html.erb',
'vendor/refinerycms/pages/app/views/admin/pages/_page.html.erb',
@@ -1001,6 +1008,9 @@ Gem::Specification.new do |s|
'vendor/refinerycms/settings/features',
'vendor/refinerycms/settings/features/manage_refinery_settings.feature',
'vendor/refinerycms/settings/features/step_definitions',
+ 'vendor/refinerycms/settings/features/step_definitions/setting_steps.rb',
+ 'vendor/refinerycms/settings/features/support',
+ 'vendor/refinerycms/settings/features/support/paths.rb',
'vendor/refinerycms/settings/lib',
'vendor/refinerycms/settings/lib/settings.rb',
'vendor/refinerycms/settings/readme.md'
View
44 todo.md
@@ -1,53 +1,25 @@
# Todos required for 0.9.9 release
-## Engine API
-
-Responsible person: ``djones``
-
-rails g refinery_engine does the following things:
-
-- Creates what it does now
-- Creates a gemspec with the gem name of "refinerycms-#{engine_name}"
-- Puts the gem in the Gemfile
-- Copies db files to the vendor/engines/engine_name/db folder ONLY
-- Creates a generator in lib/generators which will install the db to the right place
-- Creates a public, spec, and features empty folders
-- Creates lib/tasks as a template
-- Maybe some sort of README on how to release your gem open source
-
-Then the process will be:
-
-### To create a fully releasable engine
-
- rails g refinery_engine events name:string date:date picture:image
-
-### To install the plugin into your app
+## Solid Test Coverage
- rails g refinerycms_events
- bundle install
- rake db:migrate
+Responsible person: ``VGoff``, ``hubble``
-And then when it's released all new refinerycms- gems will have the same install process. Yippee!
+* Add more Cucumber features for the whole of Refinery.
+* Add RSpec for the whole of Refinery, particularly:
+ - User, User engine and User mailer
+ - Inquiry mailer
+ - Refinery settings
## Internet Explorer 7+ Support
Responsible person: ``parndt``
* WYMEditor and the dialogs are the weakest areas right now.
-Responsible person: ``stevenheidel``, ``djones``
+Responsible person: ``stevenheidel``, ``djones``, ``everyone``
* Finding and filing issues found in IE
-## Solid Test Coverage
-
-Responsible person: ``VGoff``
-
-* Add more Cucumber features for the whole of Refinery.
-* Add RSpec for the whole of Refinery, particularly:
- - User, User plugin and User mailer
- - Inquiry mailer and Inquiry setting
-
## I18n support
* Check all the views for missing translations
@@ -13,10 +13,10 @@ en:
blank_password_keeps_current: Leaving password blank keeps the current password
enable_all: enable all
index:
- create_new_user: Create New User
+ create_new_user: Add New User
user:
email_user: Email this user
- preview: (%{who}) created %{created_at}
+ preview: (%{who}) added %{created_at}
sessions:
login_successful: Logged in successfully
new:
@@ -10,14 +10,14 @@ zh-CN:
blank_password_keeps_current: Leaving password blank keeps the current password
enable_all: enable all
index:
- create_new_user: Create New User
- no_users_yet: There are no users yet. Click "Create New User" to add your first user.
+ create_new_user: Add New User
+ no_users_yet: There are no users yet. Click "Add New User" to add your first user.
user:
confirm_delete_message: "Are you sure you want to delete '%{who}'?"
confirm_delete_title: Remove this user forever
edit_user: Edit this user
email_user: Email this user
- preview: (%{who}) created %{created_at}
+ preview: (%{who}) added %{created_at}
sessions:
login_successful: Logged in successfully
login_failed: Sorry, your password or username was incorrect.
@@ -51,7 +51,7 @@ zh-CN:
please_activate: Please activate your new account
activated: Your account has been activated!
activated_email: "%{who}, your account has been activated. You may now start adding your plugins:"
- account_created: Your account has been created.
+ account_created: Your account has been added.
user_name: Username %{name}
password: Password %{password}
visit_url: "Visit this url to activate your account:"
@@ -34,14 +34,14 @@ Feature: Manage Users
Given I have a user named "resolve"
And I am a logged in refinery user
When I go to the list of users
- And I follow "Create New User"
+ And I follow "Add New User"
And I fill in "Login" with "cucumber"
And I fill in "Email" with "green@cucumber.com"
And I fill in "Password" with "greenandjuicy"
And I fill in "Password confirmation" with "greenandjuicy"
And I press "Save"
Then I should be on the list of users
- And I should see "cucumber was successfully created."
+ And I should see "cucumber was successfully added."
And I should see "cucumber (green@cucumber.com)"
Scenario: Edit User
Oops, something went wrong.

0 comments on commit a4ed7d9

Please sign in to comment.