Skip to content

Commit 89bfd34

Browse files
test(ng1): simplify tests directory
1 parent 22554af commit 89bfd34

29 files changed

+12
-13
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/ng1/ng1StateBuilderSpec.ts renamed to test/ng1StateBuilderSpec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {StateBuilder, StateMatcher, ng1ViewsBuilder} from "../../src/ng1";
1+
import {StateBuilder, StateMatcher, ng1ViewsBuilder} from "../src/ng1";
22
import {Resolvable} from "ui-router-core";
33

44
describe('Ng1 StateBuilder', function() {

test/ng1/resolveSpec.ts renamed to test/resolveSpec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import "../testUtilsNg1.js";
1+
import "./util/testUtilsNg1.js";
22
declare var resolvedValue, resolvedError, caught;
33

4-
import "../matchers.ts";
4+
import "./util/matchers.ts";
55

66
import {
77
ResolveContext, State, PathNode, omit, pick, extend, forEach
8-
} from "../../src/ng1";
8+
} from "../src/ng1";
99

1010
import Spy = jasmine.Spy;
1111
import {Resolvable, services} from "ui-router-core";
File renamed without changes.

test/ng1/stateEventsSpec.js renamed to test/stateEventsSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var module = angular.mock.module;
22
var uiRouter = require("angular-ui-router");
3-
var stateEvents = require("../../src/ng1/legacy/stateEvents.ts");
3+
var stateEvents = require("../src/ng1/legacy/stateEvents.ts");
44

55
describe('UI-Router v0.2.x $state events', function () {
66
var $injector, stateProvider;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/ng1/urlRouterSpec.ts renamed to test/urlRouterSpec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ILocationService = angular.ILocationService;
22
declare var html5Compat;
3-
import {UrlMatcher, UrlMatcherFactory, services, UrlRouterProvider, UrlRouter, StateService} from "../../src/ng1";
3+
import {UrlMatcher, UrlMatcherFactory, services, UrlRouterProvider, UrlRouter, StateService} from "../src/ng1";
44
import ILocationProvider = angular.ILocationProvider;
55

66
var module = angular.mock.module;
File renamed without changes.
File renamed without changes.

test/testUtils.ts renamed to test/util/testUtils.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import {pick, extend, forEach, omit} from "../src/core";
2-
import {map} from "../src/common/common";
1+
import {map, pick, extend, forEach, omit} from "ui-router-core";
32

43
let stateProps = ["resolve", "resolvePolicy", "data", "template", "templateUrl", "url", "name", "params"];
54

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/ng1/viewSpec.ts renamed to test/viewSpec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/// <reference path='../../node_modules/@types/angular/index.d.ts' />
2-
/// <reference path='../../node_modules/@types/angular-mocks/index.d.ts' />
3-
/// <reference path='../../node_modules/@types/jasmine/index.d.ts' />
1+
/// <reference path='../node_modules/@types/angular/index.d.ts' />
2+
/// <reference path='../node_modules/@types/angular-mocks/index.d.ts' />
3+
/// <reference path='../node_modules/@types/jasmine/index.d.ts' />
44
import * as angular from "angular";
55
var module = angular.mock.module;
66

@@ -9,11 +9,11 @@ import {curry} from "ui-router-core";
99
import {PathNode} from "ui-router-core";
1010
import {ResolveContext} from "ui-router-core";
1111
import {PathFactory} from "ui-router-core";
12-
import {ng1ViewsBuilder, ng1ViewConfigFactory} from "../../src/ng1/statebuilders/views";
12+
import {ng1ViewsBuilder, ng1ViewConfigFactory} from "../src/ng1/statebuilders/views";
1313
import {ViewService} from "ui-router-core";
1414
import {StateMatcher, StateBuilder} from "ui-router-core";
1515
import {State} from "ui-router-core";
16-
import {Ng1StateDeclaration} from "../../src/ng1/interface";
16+
import {Ng1StateDeclaration} from "../src/ng1/interface";
1717

1818
describe('view', function() {
1919
var scope, $compile, $injector, elem, $controllerProvider, $urlMatcherFactoryProvider;

0 commit comments

Comments
 (0)