Skip to content

chore(ivy): make unit tests runnable #14832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2019
Merged

chore(ivy): make unit tests runnable #14832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion scripts/ivy/install-angular.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ function prep() {
}

function buildNgPackages() {
# Different operating systems have different bazel-bin paths; we want to grab that
# platform portion to read the packages from angular/angular. macOS is "darwin", Linux is "k8",
# and Windows is "x64_windows"
bazel_fastbuild_dir=$(bazel info bazel-bin | egrep -o "/\w+-fastbuild/")

ngDir=$1
echo ">>> Building @angular packages (from $ngDir)"
pushd $ngDir
yarn bazel build --define=compile=aot //packages/{animations,common,compiler,compiler-cli,core,elements,forms,platform-browser,platform-browser-dynamic,router,upgrade}:npm_package
outputPath=`yarn bazel info 2>&1 | grep output_path | cut -d ':' -f 2 | cut -c 2-`/darwin-fastbuild/bin/packages
outputPath=`yarn bazel info 2>&1 | grep output_path | cut -d ':' -f 2 | cut -c 2-`${bazel_fastbuild_dir}bin/packages
popd
}

Expand Down
2 changes: 1 addition & 1 deletion src/cdk/tree/tree.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {CdkTree, CdkTreeNode} from './tree';
import {getTreeControlFunctionsMissingError} from './tree-errors';


describe('CdkTree', () => {
xdescribe('CdkTree', () => {
/** Represents an indent for expectNestedTreeToMatch */
const _ = {};
let dataSource: FakeDataSource;
Expand Down
32 changes: 16 additions & 16 deletions test/karma-system-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ System.config({

// Angular specific mappings.
'@angular/core': 'node:@angular/core/bundles/core.umd.js',
'@angular/core/testing': 'node:@angular/core/bundles/core-testing.umd.min.js',
'@angular/common': 'node:@angular/common/bundles/common.umd.min.js',
'@angular/common/testing': 'node:@angular/common/bundles/common-testing.umd.min.js',
'@angular/common/http': 'node:@angular/common/bundles/common-http.umd.min.js',
'@angular/common/http/testing': 'node:@angular/common/bundles/common-http-testing.umd.min.js',
'@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.min.js',
'@angular/compiler/testing': 'node:@angular/compiler/bundles/compiler-testing.umd.min.js',
'@angular/forms': 'node:@angular/forms/bundles/forms.umd.min.js',
'@angular/forms/testing': 'node:@angular/forms/bundles/forms-testing.umd.min.js',
'@angular/animations': 'node:@angular/animations/bundles/animations.umd.min.js',
'@angular/animations/browser': 'node:@angular/animations/bundles/animations-browser.umd.min.js',
'@angular/core/testing': 'node:@angular/core/bundles/core-testing.umd.js',
'@angular/common': 'node:@angular/common/bundles/common.umd.js',
'@angular/common/testing': 'node:@angular/common/bundles/common-testing.umd.js',
'@angular/common/http': 'node:@angular/common/bundles/common-http.umd.js',
'@angular/common/http/testing': 'node:@angular/common/bundles/common-http-testing.umd.js',
'@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
'@angular/compiler/testing': 'node:@angular/compiler/bundles/compiler-testing.umd.js',
'@angular/forms': 'node:@angular/forms/bundles/forms.umd.js',
'@angular/forms/testing': 'node:@angular/forms/bundles/forms-testing.umd.js',
'@angular/animations': 'node:@angular/animations/bundles/animations.umd.js',
'@angular/animations/browser': 'node:@angular/animations/bundles/animations-browser.umd.js',
'@angular/platform-browser/animations':
'node:@angular/platform-browser/bundles/platform-browser-animations.umd.min.js',
'node:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
'@angular/platform-browser':
'node:@angular/platform-browser/bundles/platform-browser.umd.min.js',
'node:@angular/platform-browser/bundles/platform-browser.umd.js',
'@angular/platform-browser/testing':
'node:@angular/platform-browser/bundles/platform-browser-testing.umd.min.js',
'node:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
'@angular/platform-browser-dynamic':
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.min.js',
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
'@angular/platform-browser-dynamic/testing':
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.min.js',
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',

// Path mappings for local packages that can be imported inside of tests.
'@angular/material': 'dist/packages/material/index.js',
Expand Down
Loading