External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-24 07:51:23 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixing tests

Browse Source
This commit is contained in:
Jared Tabor 2017-07-18 14:43:37 -07:00
parent f7f186e676
commit 80111c2091
21 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/app.js
View File

@ -77,7 +77,7 @@ import '../lib/models';
import '../lib/services';
import '../features';
var app = angular.module('app', [
var awApp = angular.module('awApp', [
// how to add CommonJS / AMD third-party dependencies:
// 1. npm install --save package-name
// 2. add package name to ./grunt-tasks/webpack.vendorFiles
@ -232,6 +232,10 @@ var app = angular.module('app', [
$rootScope.breadcrumb = {};
$rootScope.BRAND_NAME = AppStrings.get('BRAND_NAME');
$rootScope.tabTitle = `Ansible ${$rootScope.BRAND_NAME}`;
$rootScope.$watch('$state.current.ncyBreadcrumbLabel', function(title) {
$rootScope.tabTitle = `Ansible ${$rootScope.BRAND_NAME} ${title || ""}`;
});
function activateTab() {
// Make the correct tab active
@ -281,6 +285,8 @@ var app = angular.module('app', [
$rootScope.crumbCache = [];
$rootScope.$on("$stateChangeStart", function (event, next) {
// let current_title = $rootScope.$state.current.ncyBreadcrumbLabel || "";
// $rootScope.tabTitle = `Ansible ${$rootScope.BRAND_NAME} ${current_title}`;
// Remove any lingering intervals
// except on jobResults.* states
var jobResultStates = [
@ -460,4 +466,4 @@ var app = angular.module('app', [
}
]);
export default app;
export default awApp;

1
awx/ui/client/src/system-tracking/compare-facts/fact-template.js
View File

@ -13,6 +13,7 @@ function loadFactTemplate(factTemplate, fact) {
}
}
FactTemplate.prototype.render = function(factData) {
if (_.isUndefined(factData) || _.isEmpty(factData)) {

4
awx/ui/templates/ui/index.html
View File

@ -1,11 +1,11 @@
<!DOCTYPE html>
{% load i18n %}
<html lang="en" ng-app="app">
<html lang="en" ng-app="awApp">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>{% trans 'Ansible Tower' %}</title>
<title ng-bind="tabTitle"></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="{{ STATIC_URL }}assets/custom-theme/jquery-ui-1.10.3.custom.min.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}assets/ansible-bootstrap.min.css" />

2
awx/ui/tests/spec/inventories/insights/insights.service-test.js
View File

@ -10,7 +10,7 @@ import low_insights_json from './data/low.insights-data.js';
describe('Service: InsightsService', () => {
let InsightsService;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.inject(( _InsightsService_) => {
InsightsService = _InsightsService_;

2
awx/ui/tests/spec/inventories/manage/inventory-manage.service-test.js
View File

@ -5,7 +5,7 @@ describe('Service: InventoriesService', () => {
let Rest,
InventoriesService;
beforeEach(angular.mock.module('Tower'), ($provide)=>{
beforeEach(angular.mock.module('awApp'), ($provide)=>{
$provide.value('Rest', Rest);
});
beforeEach(angular.mock.module('inventoryManage'));

4
awx/ui/tests/spec/job-results/job-results.controller-test.js
View File

@ -196,7 +196,7 @@ describe('Controller: jobResultsController', () => {
});
});
describe('getTowerLinks()', () => {
describe('getLinks()', () => {
beforeEach(() => {
jobData.related = {
"created_by": "api/v2/users/12",
@ -225,7 +225,7 @@ describe('Controller: jobResultsController', () => {
});
});
describe('getTowerLabels()', () => {
describe('getLabels()', () => {
beforeEach(() => {
jobDataOptions.actions.GET = {
status: {

2
awx/ui/tests/spec/job-results/job-results.service-test.js
View File

@ -3,7 +3,7 @@
describe('jobResultsService', () => {
let jobResultsService;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.inject(( _jobResultsService_) => {
jobResultsService = _jobResultsService_;

2
awx/ui/tests/spec/job-results/parse-stdout.service-test.js
View File

@ -4,7 +4,7 @@ describe('parseStdoutService', () => {
let parseStdoutService,
log;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.module('jobResults',($provide) => {
log = jasmine.createSpyObj('$log', [

2
awx/ui/tests/spec/license/license.controller-test.js
View File

@ -8,7 +8,7 @@ describe('Controller: LicenseController', () => {
ProcessErrors,
config;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.module('license', ($provide) => {
ConfigService = jasmine.createSpyObj('ConfigService', [
'getConfig',

2
awx/ui/tests/spec/shared/filters/append.filter-test.js
View File

@ -3,7 +3,7 @@
describe('Filter: append', () => {
var filter;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(function(){
inject(function($injector){

2
awx/ui/tests/spec/shared/filters/capitalize.filter-test.js
View File

@ -3,7 +3,7 @@
describe('Filter: capitalize', () => {
var filter;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(function(){
inject(function($injector){

2
awx/ui/tests/spec/shared/filters/format-epoch.filter-test.js
View File

@ -3,7 +3,7 @@
describe('Filter: formatEpoch', () => {
var filter;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(function(){
inject(function($injector){

2
awx/ui/tests/spec/shared/filters/is-empty.filter-test.js
View File

@ -3,7 +3,7 @@
describe('Filter: isEmpty', () => {
var filter;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(function(){
inject(function($injector){

2
awx/ui/tests/spec/shared/filters/long-date.filter-test.js
View File

@ -3,7 +3,7 @@
describe('Filter: longDate', () => {
var filter;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(function(){
inject(function($injector){

2
awx/ui/tests/spec/shared/filters/prepend.filter-test.js
View File

@ -3,7 +3,7 @@
describe('Filter: prepend', () => {
var filter;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(function(){
inject(function($injector){

2
awx/ui/tests/spec/shared/filters/xss-sanitizer.filter-test.js
View File

@ -3,7 +3,7 @@
describe('Filter: sanitize', () => {
var filter;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(function(){
inject(function($injector){

2
awx/ui/tests/spec/smart-search/queryset.service-test.js
View File

@ -6,7 +6,7 @@ describe('Service: QuerySet', () => {
Authorization,
SmartSearchService;
beforeEach(angular.mock.module('Tower', ($provide) =>{
beforeEach(angular.mock.module('awApp', ($provide) =>{
// @todo: improve app source / write testing utilities for interim
// we don't want to be concerned with this provision in every test that involves the Rest module
Authorization = {

2
awx/ui/tests/spec/smart-search/smart-search.service-test.js
View File

@ -3,7 +3,7 @@
describe('Service: SmartSearch', () => {
let SmartSearchService;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.module('SmartSearchModule'));

2
awx/ui/tests/spec/templates/templates-list.controller-test.js
View File

@ -18,7 +18,7 @@ describe('Controller: TemplatesList', () => {
deleteJobTemplateDeferred,
Dataset;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.module('templates', ($provide) => {
state = jasmine.createSpyObj('state', [

2
awx/ui/tests/spec/workflows/workflow-add.controller-test.js
View File

@ -18,7 +18,7 @@ describe('Controller: WorkflowAdd', () => {
ToJSON,
availableLabels;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.module('RestServices'));
beforeEach(angular.mock.module('templates', ($provide) => {

2
awx/ui/tests/spec/workflows/workflow-maker.controller-test.js
View File

@ -8,7 +8,7 @@ describe('Controller: WorkflowMaker', () => {
q,
getWorkflowJobTemplateNodesDeferred;
beforeEach(angular.mock.module('Tower'));
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.module('templates', () => {
TemplatesService = {