openstack/horizon
Code Issues Proposed changes

Moving inline html code out of action-list.spec.js

Browse Source 
Currently there are some html code for test hard-coded inside of spec.js
file. It would be much better to move them out to separate html file for
better readability, cleaner spec code. This will also enable the sharing
html mock code between specs.

This patch moves inline html code out of action-list.spec.js.

Change-Id: Id05fbf3948fad3926cc3ecc09e0c95acc84ce41e
Partial-Bug: #1485134
This commit is contained in:
Shaoquan Chen 2015-08-14 17:05:51 -07:00
parent 63dde49928
commit 2435f1b3f9
4 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
horizon/static/framework/widgets/action-list/action-list.single-button-dropdown.mock.html Normal file
View File

@ -0,0 +1,11 @@
<action-list dropdown>
<action button-type="single-button">Actions</action>
<menu>
<action button-type="menu-item" callback="clickMe" item="item">
Edit
</action>
<action button-type="menu-item" callback="clickMe" item="item">
Delete
</action>
</menu>
</action-list>

47
horizon/static/framework/widgets/action-list/action-list.spec.js
View File

@ -24,14 +24,16 @@
describe('action-list directive', function () {
beforeEach(module('templates'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.action-list'));
beforeEach(module('horizon.framework'));
describe('single button dropdown', function () {
var $scope, $element;
beforeEach(inject(function ($injector) {
var $compile = $injector.get('$compile');
var $templateCache = $injector.get('$templateCache');
var basePath = $injector.get('horizon.framework.widgets.basePath');
$scope = $injector.get('$rootScope').$new();
$scope.testList = [];
@ -41,18 +43,8 @@
$scope.testList.push(item);
};
var markup =
'<action-list dropdown>' +
' <action button-type="single-button">Actions</action>' +
' <menu>' +
' <action button-type="menu-item" callback="clickMe" item="item">' +
' Edit' +
' </action>' +
' <action button-type="menu-item" callback="clickMe" item="item">' +
' Delete' +
' </action>' +
' </menu>' +
'</action-list>';
var markup = $templateCache
.get(basePath + 'action-list/action-list.single-button-dropdown.mock.html');
$element = angular.element(markup);
$compile($element)($scope);
@ -85,6 +77,8 @@
beforeEach(inject(function ($injector) {
var $compile = $injector.get('$compile');
var $templateCache = $injector.get('$templateCache');
var basePath = $injector.get('horizon.framework.widgets.basePath');
$scope = $injector.get('$rootScope').$new();
$scope.testList = [];
@ -94,20 +88,8 @@
$scope.testList.push(item);
};
var markup =
'<action-list dropdown>' +
' <action button-type="split-button" callback="clickMe" item="item">' +
' View' +
' </action>' +
' <menu>' +
' <action button-type="menu-item" callback="clickMe" item="item">' +
' Edit' +
' </action>' +
' <action button-type="menu-item" callback="clickMe" item="item">' +
' Delete' +
' </action>' +
' </menu>' +
'</action-list>';
var markup = $templateCache
.get(basePath + 'action-list/action-list.split-botton-dropdown.mock.html');
$element = angular.element(markup);
$compile($element)($scope);
@ -151,6 +133,8 @@
beforeEach(inject(function ($injector) {
var $compile = $injector.get('$compile');
var $templateCache = $injector.get('$templateCache');
var basePath = $injector.get('horizon.framework.widgets.basePath');
$scope = $injector.get('$rootScope').$new();
$scope.testList = [];
@ -160,11 +144,8 @@
$scope.testList.push(item);
};
var markup = '<action-list dropdown>' +
' <action callback="clickMe" item="item">View</action>' +
' <action callback="clickMe" item="item">Edit</action>' +
' <action callback="clickMe" item="item">Delete</action>' +
'</action-list>';
var markup = $templateCache
.get(basePath + 'action-list/button-group.mock.html');
$element = angular.element(markup);
$compile($element)($scope);

13
horizon/static/framework/widgets/action-list/action-list.split-botton-dropdown.mock.html Normal file
View File

@ -0,0 +1,13 @@
<action-list dropdown>
<action button-type="split-button" callback="clickMe" item="item">
View
</action>
<menu>
<action button-type="menu-item" callback="clickMe" item="item">
Edit
</action>
<action button-type="menu-item" callback="clickMe" item="item">
Delete
</action>
</menu>
</action-list>

5
horizon/static/framework/widgets/action-list/button-group.mock.html Normal file
View File

@ -0,0 +1,5 @@
<action-list dropdown>
<action callback="clickMe" item="item">View</action>
<action callback="clickMe" item="item">Edit</action>
<action callback="clickMe" item="item">Delete</action>
</action-list>