Skip to content

Commit 22c9105

Browse files
authored
Merge pull request #5 from cal-smith/master
Get some tests working, make sure the build is solid
2 parents 5d33eef + 67c0233 commit 22c9105

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

scripts/deploy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ npm run semantic-release
1212
# deploy to gh pages
1313
if [[ $TRAVIS_BRANCH == "master" ]]; then
1414
mkdir pages
15-
cp -R dist/docs/documentation pages/
16-
cp -R dist/docs/storybook/* pages
15+
cp -R dist/docs/documentation/ pages/documentation
16+
cp -R dist/docs/storybook/ pages
1717

1818
git config user.name "Carbon Deploy"
1919

src/banner/banner.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import { BannerService } from "./banner.service";
2020
template: `
2121
<div
2222
#banner
23-
class="bx--inline-notification bx--inline-notification--{{bannerObj.type}}"
23+
class="bx--inline-notification bx--inline-notification--{{bannerObj['type']}}"
2424
role="alert">
2525
<div class="bx--inline-notification__details">
2626
<svg class="bx--inline-notification__icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
2727
<path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zM3.293 4.707l8 8 1.414-1.414-8-8-1.414 1.414z" fill-rule="evenodd"/>
2828
</svg>
2929
<div class="bx--inline-notification__text-wrapper">
30-
<p [innerHTML]="bannerObj.title" class="bx--inline-notification__title"></p>
31-
<p [innerHTML]="bannerObj.message" class="bx--inline-notification__subtitle"></p>
30+
<p [innerHTML]="bannerObj['title']" class="bx--inline-notification__title"></p>
31+
<p [innerHTML]="bannerObj['message']" class="bx--inline-notification__subtitle"></p>
3232
</div>
3333
</div>
3434
<button

src/dialog/tooltip/tooltip.directive.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe("Tooltip directive", () => {
4242
expect(directiveEl).not.toBeNull();
4343
});
4444

45-
xit("should create the tooltip component and tooltip should appear at the top", () => {
45+
it("should create the tooltip component and tooltip should appear at the top", () => {
4646
TestBed.overrideComponent(TooltipTestComponent, {
4747
set: {
4848
template: "<button ibmTooltip='Hello There' placement='top'>Me</button>"
@@ -57,7 +57,7 @@ describe("Tooltip directive", () => {
5757
fixture.detectChanges();
5858

5959
expect(fixture.componentInstance instanceof TooltipTestComponent).toBe(true);
60-
expect(document.querySelector(".tooltip--top")).not.toBe(null);
60+
expect(document.querySelector(".bx--tooltip")).not.toBe(null);
6161
});
6262

6363
xit("should create the tooltip component and tooltip should appear at the bottom", () => {

0 commit comments

Comments
 (0)