Skip to content

Commit

Permalink
Update CircleCI config
Browse files Browse the repository at this point in the history
  • Loading branch information
runem committed Jun 26, 2019
1 parent a2ae83b commit e4c44e2
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 39 deletions.
58 changes: 28 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,40 @@
#
version: 2
jobs:
build:
docker:
- image: circleci/node:11.10.0
build:
docker:
- image: circleci/node:11.10.0

working_directory: ~/repo
working_directory: ~/repo

steps:
- checkout
steps:
- checkout

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-
# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package-lock.json" }}
- v1-dependencies-

- run: npm install
- run: npm install

- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}
- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package-lock.json" }}

# Download and cache dependencies for "/dev"
- restore_cache:
keys:
- v1-dependencies-dev-{{ checksum "./dev/package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-dev-
# Download and cache dependencies for "/dev"
- restore_cache:
keys:
- v1-dependencies-dev-{{ checksum "./dev/package-lock.json" }}
- v1-dependencies-dev-

- run: cd dev && npm install
- run: cd dev && npm install

- save_cache:
paths:
- dev/node_modules
key: v1-dependencies-dev-{{ checksum "./dev/package.json" }}
- save_cache:
paths:
- dev/node_modules
key: v1-dependencies-dev-{{ checksum "./dev/package-lock.json" }}

# run tests!
- run: npm test
# run tests!
- run: npm test
4 changes: 0 additions & 4 deletions test/flavors/custom-element/ctor-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ test("Property assignments in the constructor are picked up", t => {
customElement.define("my-element", MyElement);
`);

t.log(result.componentDefinitions[0].declaration);

const {
declaration: { members }
} = result.componentDefinitions[0];
Expand Down Expand Up @@ -84,8 +82,6 @@ test("Property assignments in the constructor are correctly merged", t => {
declaration: { members }
} = result.componentDefinitions[0];

t.log(members);

t.is(members.length, 1);

const fooProp = getComponentProp(members, "foo");
Expand Down
6 changes: 3 additions & 3 deletions test/flavors/jsdoc/parse-jsdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ for (let checkType = 0; checkType <= 1; checkType++) {
const expectedComment = checkComment ? parsedJsDocTag.comment : undefined;

// Generate a combination of: "{Type} Name - Comment"
const jsdocComment = `${expectedType ? `{${expectedType}} ` : ""}${expectedName ? expectedName : ""}${expectedComment ? ` - ${expectedComment}` : ""}`;
const jsdocComment = `${expectedType ? `{${expectedType}} ` : ""}${expectedName ? expectedName : ""}${
expectedComment ? ` - ${expectedComment}` : ""
}`;
const { type, name, comment } = parseJsDocTagComment(jsdocComment);

t.log("JsDoc Comment: ", jsdocComment);

t.is(type, expectedType);
t.is(name, expectedName);
t.is(comment, expectedComment);
Expand Down
2 changes: 0 additions & 2 deletions test/flavors/polymer/polymer-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ test("Polymer components are correctly picked up", t => {
customElements.define('x-custom', XCustom);
`);

t.log(result.componentDefinitions[0].declaration);

const {
declaration: { members }
} = result.componentDefinitions[0];
Expand Down

0 comments on commit e4c44e2

Please sign in to comment.