openstack
/
horizon
Code Issues Proposed changes

Clean up spec files in horizon framework directory 

We only need:
beforeEach(module('horizon.framework'))
as mentioned by Sean in table.controller.spec.js  here:
https://review.openstack.org/#/c/172602/19/

Change-Id: Id3bbbd151d0642d6fef1e6eca4bfb248371b0f08
This commit is contained in:
Cindy Lu 2015-09-04 09:32:39 -07:00 committed by Matt Borland
parent 680b057fe1
commit fab9cf6fd1
21 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/topics/javascript_testing.rst
View File

@ -132,7 +132,7 @@ Lines added to ``horizon/test/jasmine/jasmine_tests.py``:
describe('horizon.framework.widgets.modal module', function() {
beforeEach(module('horizon.framework.widgets.modal'));
beforeEach(module('horizon.framework'));
describe('simpleModalCtrl', function() {
var scope;

2
horizon/static/framework/util/bind-scope/bind-scope.spec.js
View File

@ -11,8 +11,6 @@
var $scope, $element;
beforeEach(module('horizon.framework'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.util.bind-scope'));
beforeEach(module('horizon.framework.util.bind-scope', function ($compileProvider) {
/* eslint-disable angular/ng_module_getter */

3
horizon/static/framework/util/filters/filters.spec.js
View File

@ -2,8 +2,7 @@
'use strict';
describe('horizon.framework.util.filters', function () {
beforeEach(module('horizon.framework.util.i18n'));
beforeEach(module('horizon.framework.util.filters'));
beforeEach(module('horizon.framework'));
describe('yesno', function () {
var yesnoFilter;

2
horizon/static/framework/util/http/http.spec.js
View File

@ -10,7 +10,7 @@
describe('api service', function () {
var api, $httpBackend;
beforeEach(module('horizon.framework.util.http'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function ($injector) {
api = $injector.get('horizon.framework.util.http.service');
$httpBackend = $injector.get('$httpBackend');

2
horizon/static/framework/util/i18n/i18n.spec.js
View File

@ -17,7 +17,7 @@
'use strict';
describe('horizon.framework.util.i18n', function () {
beforeEach(module('horizon.framework.util.i18n'));
beforeEach(module('horizon.framework'));
describe('gettext', function () {
var factory;

3
horizon/static/framework/util/validators/validators.spec.js
View File

@ -8,8 +8,7 @@
});
describe('validators directive', function () {
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.util.validators'));
beforeEach(module('horizon.framework'));
describe('validateNumberMax directive', function () {
var $scope, $form;

2
horizon/static/framework/util/workflow/workflow.spec.js
View File

@ -19,7 +19,7 @@
}
];
beforeEach(module('horizon.framework.util.workflow'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function ($injector) {
workflow = $injector.get('horizon.framework.util.workflow.service');

2
horizon/static/framework/widgets/charts/chart-tooltip.spec.js
View File

@ -21,8 +21,6 @@
beforeEach(module('templates'));
beforeEach(module('horizon.framework'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.charts'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
var $compile = _$compile_;

2
horizon/static/framework/widgets/charts/charts.spec.js
View File

@ -24,7 +24,7 @@
describe('showKeyFilter', function () {
var showKeyFilter;
beforeEach(module('horizon.framework.widgets.charts'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function (_showKeyFilterFilter_) {
showKeyFilter = _showKeyFilterFilter_;

2
horizon/static/framework/widgets/charts/pie-chart.spec.js
View File

@ -30,8 +30,6 @@
beforeEach(module('templates'));
beforeEach(module('horizon.framework'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.charts'));
function cleanSpaces(string) {
return string.trim().replace(/\s+/, ' ');

2
horizon/static/framework/widgets/headers/headers.module.spec.js
View File

@ -26,8 +26,6 @@
var headersBasePath, staticUrl;
beforeEach(module('horizon.framework'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.headers'));
beforeEach(inject(function ($injector) {
headersBasePath = $injector.get('horizon.framework.widgets.headers.basePath');
staticUrl = $injector.get('$window').STATIC_URL;

2
horizon/static/framework/widgets/headers/hz-page-header.directive.spec.js
View File

@ -29,8 +29,6 @@
beforeEach(module('templates'));
beforeEach(module('horizon.framework'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.headers'));
beforeEach(inject(function ($injector) {
$compile = $injector.get('$compile');

3
horizon/static/framework/widgets/help-panel/help-panel.directive.spec.js
View File

@ -21,8 +21,7 @@
element;
beforeEach(module('templates'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.help-panel'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function ($injector) {
$scope = $injector.get('$rootScope').$new();
$compile = $injector.get('$compile');

2
horizon/static/framework/widgets/magic-search/hz-magic-search-bar.spec.js
View File

@ -22,7 +22,7 @@
beforeEach(module('templates'));
beforeEach(module('smart-table'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework'));
beforeEach(module('MagicSearch'));
beforeEach(inject(function ($injector) {

5
horizon/static/framework/widgets/metadata/display/display.spec.js
View File

@ -108,10 +108,7 @@
var $scope, $element;
beforeEach(module('templates'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.metadata'));
beforeEach(module('horizon.framework.widgets.metadata.tree'));
beforeEach(module('horizon.framework.widgets.metadata.display'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function ($injector) {
var $compile = $injector.get('$compile');
$scope = $injector.get('$rootScope').$new();

3
horizon/static/framework/widgets/metadata/tree/tree.spec.js
View File

@ -103,9 +103,6 @@
beforeEach(module('templates'));
beforeEach(module('horizon.framework'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.metadata'));
beforeEach(module('horizon.framework.widgets.metadata.tree'));
describe('metadataTree directive', function () {

6
horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.spec.js
View File

@ -20,8 +20,7 @@
var service, modal;
beforeEach(module('ui.bootstrap'));
beforeEach(module('horizon.framework.conf'));
beforeEach(module('horizon.framework.widgets.modal-wait-spinner'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function($injector, $modal) {
service = $injector.get('horizon.framework.widgets.modal-wait-spinner.service');
@ -75,8 +74,7 @@
var $scope, $element, $timeout;
beforeEach(module('ui.bootstrap'));
beforeEach(module('horizon.framework.conf'));
beforeEach(module('horizon.framework.widgets.modal-wait-spinner'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function($injector) {
var $compile = $injector.get('$compile');

6
horizon/static/framework/widgets/toast/toast.spec.js
View File

@ -33,8 +33,7 @@
var infoMsg = "I am info.";
beforeEach(module('templates'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.toast'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function ($injector) {
service = $injector.get('horizon.framework.widgets.toast.service');
$scope = $injector.get('$rootScope').$new();
@ -107,8 +106,7 @@
}
beforeEach(module('templates'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.toast'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function ($injector) {
$scope = $injector.get('$rootScope').$new();
$compile = $injector.get('$compile');

3
horizon/static/framework/widgets/transfer-table/transfer-table.controller.spec.js
View File

@ -22,9 +22,6 @@
beforeEach(module('templates'));
beforeEach(module('smart-table'));
beforeEach(module('horizon.framework'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.table'));
beforeEach(module('horizon.framework.widgets.transfer-table'));
var log, params;
beforeEach(module(function($provide) {

2
horizon/static/framework/widgets/widgets.module.spec.js
View File

@ -23,7 +23,7 @@
});
describe('horizon.framework.widgets.basePath', function () {
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework'));
it('should be defined and set correctly', inject([
'horizon.framework.widgets.basePath', '$window',

5
horizon/static/framework/widgets/wizard/wizard.spec.js
View File

@ -28,8 +28,7 @@
element;
beforeEach(module('templates'));
beforeEach(module('horizon.framework.widgets'));
beforeEach(module('horizon.framework.widgets.wizard'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function ($injector) {
$scope = $injector.get('$rootScope').$new();
$compile = $injector.get('$compile');
@ -197,7 +196,7 @@
describe("ModalContainerController", function() {
var ctrl, scope, modalInstance, launchContext;
beforeEach(module('horizon.framework.widgets.wizard'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function($controller) {
scope = {};