Skip to content

Commit

Permalink
Fixes linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ZitaNemeckova committed Feb 19, 2018
1 parent f3135f0 commit b1505a8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/javascript/spec/dashboards/mocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ window.ManageIQ = {
window.__ = (x) => x;

// FIXME: app/assets/javascripts/services/
ManageIQ.angular.app.service('miqService', function() {
ManageIQ.angular.app.service('miqService', function () {
this.handleFailure = () => null;
});

// FIXME: miq_application.js
window.miqDeferred = () => {
var deferred = {};

deferred.promise = new Promise(function(resolve, reject) {
deferred.promise = new Promise(function (resolve, reject) {
deferred.resolve = resolve;
deferred.reject = reject;
});
Expand Down
10 changes: 5 additions & 5 deletions app/javascript/spec/dashboards/widget-empty.test.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { module, inject } from './mocks';

describe('widget-empty', function() {
describe('widget-empty', function () {
var $scope, element, $compile;

beforeEach(module('ManageIQ'));
beforeEach(inject(function(_$compile_, $rootScope, $templateCache) {
beforeEach(inject(function (_$compile_, $rootScope, $templateCache) {
// FIXME: templateRequest is using $http to get the template, but angular-mocks prevents it
$templateCache.put('/static/dropdown-menu.html.haml', '<div></div>');
$scope = $rootScope;
$scope.miqButtonClicked = function() {};
$scope.miqButtonClicked = function () {};
$scope.validForm = true;
$compile = _$compile_;
}));

it('is rendered in widget-wrapper if widget-blank is set to true', function(done) {
it('is rendered in widget-wrapper if widget-blank is set to true', function (done) {
element = angular.element(
'<form name="angularForm">' +
'<widget-wrapper widget-id="42" widget-blank=true widget-buttons="null"></widget-wrapper>' +
Expand All @@ -23,7 +23,7 @@ describe('widget-empty', function() {

$scope.$digest();

setTimeout(function() {
setTimeout(function () {
var widget = element.find("widget-empty");
expect(widget.length).toBe(1);

Expand Down
16 changes: 9 additions & 7 deletions app/javascript/spec/dashboards/widget-wrapper.test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { module, inject } from './mocks';

describe('widget-wrapper', function() {
var $scope, element, $compile;
var widgetTypes = ['chart', 'menu', 'report', 'rss'];
let $scope;
let element;
let $compile;
let widgetTypes = ['chart', 'menu', 'report', 'rss'];

beforeEach(module('ManageIQ'));

beforeEach(inject(function(_$compile_, $rootScope, $templateCache, $http) {
beforeEach(inject(function (_$compile_, $rootScope, $templateCache, $http) {
// FIXME: templateRequest is using $http to get the template, but angular-mocks prevents it
$templateCache.put('/static/dropdown-menu.html.haml', '<div></div>');

Expand Down Expand Up @@ -35,7 +37,7 @@ describe('widget-wrapper', function() {
}));

widgetTypes.forEach(function (widget) {
it('renders widget-' + widget + ' when widget-type is ' + widget, function(done) {
it('renders widget-' + widget + ' when widget-type is ' + widget, function (done) {
element = angular.element(
'<form name="angularForm">' +
' <widget-wrapper widget-id="42" widget-blank=false widget-buttons="null" widget-type="' + widget + '"></widget-wrapper>' +
Expand All @@ -44,11 +46,11 @@ describe('widget-wrapper', function() {
element = $compile(element)($scope);
$scope.$digest();

var $ctrl = element.find('widget-wrapper').find('div').scope().vm;
$ctrl.promise.catch(function () {}).then(function(){
let $ctrl = element.find('widget-wrapper').find('div').scope().vm;
$ctrl.promise.catch(function () {}).then(function (){
$scope.$digest();

var widgetElement = element.find("widget-" + widget);
let widgetElement = element.find("widget-" + widget);
expect(widgetElement.length).toBe(1);
done();
});
Expand Down

0 comments on commit b1505a8

Please sign in to comment.