Commit Graph

13 Commits

Author SHA1 Message Date
Timur Sufiev 7fc50585be Start developing HOT Builder on Merlin
Create basic file structure and use common Django template for both
views. Also rework forms/YAML/Graph divs layout to make it more flexible.

Create draft version of 'Add Resource' panel for HotBuilder - with
resources filtering and a list of all available resources obtained
from server-side Heat API.

Change-Id: Ia2e4f8a63d85d8d5dd7cdd731cc4878836176070
2015-08-05 10:12:03 +00:00
Michael Krotscheck 4018c61252 Use eslint-config-openstack
Instead of explicitly copying all the linting rules between projects,
openstack now publishes a set of rules (much like hacking) that can
be included in projects that want to adhere by our standards. This
patch switches merlin to use this set of rules.

Note: The rules in eslint-config-openstack are a verbatim copy
of what's currently in use in Horizon. Future versions will likely start
activating rules flagged as "TODO", however you can avoid build
instability by avoiding the use of fuzzy version matching in
package.json (which this patch does).

Also, I had to bump down the version of eslint in this patch, because
there was an explicit version conflict. Once we get to the point
of synchronizing dependencies, we'll be able to manage this from a
central location.

Change-Id: I5fa569e314d0b7f936b750e4845295debe5420a8
2015-07-15 13:51:32 -07:00
Timur Sufiev d82d48453f Add Mistral js files to linter and fix linting errors
As a consequence, change how the workbookCtrl controller is used (and
unit-tests for it).

Change-Id: I21514ac01baa81c5a760abd9e7d0f909d89617d6
2015-07-13 15:05:58 +03:00
Jenkins 6062444015 Merge "Added JS Linting via ESlint" 2015-07-06 20:02:47 +00:00
Paul Karikh bf942fef1c Add FAQ and glossary
This patch adds FAQ and glossary
to the readme.md file.
Also this patch adds documentation
for Merlin directives.
Also this patch grunt task for generation
html from markdown.
To run this task run 'grunt md' from the
Merlin directory.

Change-Id: Ifd98fe4d9fa61bf5b7bbd71361763caa93e7ed3e
2015-07-06 14:52:47 +03:00
Michael Krotscheck b890c88fc1 Added JS Linting via ESlint
This patch applies the same linting rules currently in use by Horizon,
to the Merlin Project. Note that this patch exposes about 52 linting
errors, which the merlin team will need to address.

Change-Id: I725159a4b285a3bf731a4ad61da270f7894328c2
2015-06-30 14:47:26 -07:00
Michael Krotscheck 4beaf29f6e Added test execution in Firefox.
This adds capturing and executing tests in the Firefox browser. It also
adds the use of the jasmine-jquery framework to permit easier detection
of DOM elements in a rendered directive, as the present method does not
play well with Firefox' tendency to randomly reorder attribute positions.

Testing with Firefox is already supported in infra.

Change-Id: Ifc81e1b243975536ee40e627c1e4a164855fe85c
2015-06-17 12:19:32 -07:00
Michael Krotscheck fc2f3628e4 Added test execution in Chromium.
This adds capturing and executing tests in the Chromium browser.
It is already supported in infra.

Change-Id: I4d18da18f9b93dc057cbe71667c5871e8210c50d
2015-06-16 12:06:36 -07:00
Michael Krotscheck 3148fc8903 Removed fuzzy dependencies.
Fuzzy dependencies tend to be a little brittle, as breaking changes
could be introduced that engineers are not aware of. This locks
down the versions used in this project's npm dependencies. (The
bower dependencies didn't need them).

Change-Id: I5bacb62a724b803926aa16859e536b15a74d40c1
2015-06-16 12:06:29 -07:00
Michael Krotscheck bc207adde8 Bound karma execution to `npm run test`
This is in anticipation of moving this project to using
the javascript-jobs group, rather than explicitly declaring jobs.

Change-Id: I2f77f92745849f742290a3877fe78cc2e39b13b9
2015-06-16 12:06:21 -07:00
Michael Krotscheck 54b30e5bab Added npm run test-unit to merlin's package.json file
This enables the `npm run test-unit` command, which may be used
inside of OpenStack's infra to trigger the NPM build chain. It
also binds `bower install` to the postinstall hook, which allows
us to install all dependencies (npm, bower) with one command.

Change-Id: Ia487e8d21f18f9ac44fc14da2011ab60ef6d5a4f
2015-05-11 13:30:49 -07:00
Timur Sufiev e9e750ef4c Add unit-tests for merlin directives
To simplify templates serving the plugin karma-ng-html2js-preprocessor
has been added to Karma and project dependencies.

Change-Id: If947acd2e9d7e64838c31e406d04fa9c1c67c770
Implements: blueprint merlin-unittests
2015-04-25 11:00:39 -07:00
Paul Karikh 05451e3e59 Add karma testing
This patch adds configuration for Karma.

Change-Id: Ibb65060836f967ac81a57ea279d7fa494e238d49
Implements blueprint: merlin-unittests
2015-04-17 15:27:11 +03:00