search

saschakiefer / generator-openui5

yeoman generator for OpenUI5 applications and assets
Other
64 stars 17 forks source link

Enhanced the Fiori master/detail template and got the tests working for all generators #22

Closed js1972 closed 10 years ago

js1972 commented 10 years ago

1) Fixed formatting of the fiori template and changed the root view to be xml instead of js as per the SublimeUI5 repo; adjusted files that didn't follow code format convention; removed reporting options from .jshintrc files as they were causing issues with the jshint sublime plugin. 2) Wrapped fiori js files in anon funcs. 3) Got tests working again - must do "npm update -g yo" to ensure yeoman-generator is >= 0.16.0 to ensure helper file function bug is fixed. 4) Refactor tests into separate files for each generator. 5) Remove useless editor.config file that was created by generator-generator. 6) Add a default watch task to the generator gruntfile which watches the generator files and does both a jshint and testMocha task on save. 7) Add tests for ui and faceless components. Note that these two tests raise a warning in the console output that they could not find an index.html to modify with a localResources() call. This is fine though as the test is specifically to test the files that are generated. Would be good in future to add in tests to check the index.html changes by the sub-generators.

Apologies in advance for not following commit message style - couldn't work out how to do a multi-line message properly in windows - works fine on my Mac though. If I go back and change the messages it will screw the history so just left it.

saschakiefer commented 10 years ago

I merged it. Regarding the commit message conventions: I usually merge with --no-ff, thus you can commit the single commits with the agreed format, then they don't get lost and there is no need for a multi line message in the merge commit.

js1972 commented 10 years ago

Confused... Adding --no-ff (fast forward) allows me to add a commit message on the merge. 

Therefore are you saying that my individual commits can be anyway I like but then on the mege commit I follow the multi line convention?

On Mon, Jan 20, 2014 at 12:19 AM, saschakiefer notifications@github.com wrote:

I merged it. Regarding the commit message conventions: I usually merge with --no-ff, thus you can commit the single commits with the agreed format, then they don't get lost and there is no need for a multi line message in the merge commit.

Reply to this email directly or view it on GitHub: https://github.com/saschakiefer/generator-openui5/pull/22#issuecomment-32712036

saschakiefer commented 10 years ago

No, the other way around :) The individual commits should follow the convention, but the merge commit can be anyway you like. With --no-ff the individual commit messages are not lost and the generator takes everything he gets from the last version tag.

The changelog generator can't handle mufti line commits. For your last merge, I did it manually to get a chance to modify the merge commit message and converted your changes in a multi line message where every line followed the convention. The generator couldn't handle that :(