Changeset [836d94a8eef41ad75cfe6059c2eac4394dcb1eb8] by Yomi Colledge
Revision 836d94a8eef41ad75cfe6059c2eac4394dcb1eb8,
committed by Yomi Colledge
· April 15th, 2010 @ 05:07 PM
Added scenario and implementation code for merging a feature
file with a system feature, still need to finish implementation,
will work on this later.
http://github.com/baphled/salad/commit/836d94a8eef41ad75cfe6059c2ea...
6 changed files
-
A
app/views/features/system_merge.html.erb -
M
app/controllers/features_controller.rb -
M
features/plain/updating_features.feature -
M
features/step_definitions/updating_feature_steps.rb -
M
spec/controllers/features_controller_spec.rb -
M
spec/views/features/merge.html.erb_spec.rb