Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into fluid-grid
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackbaud-JeffDye authored Aug 11, 2017
2 parents 165459d + 84a3dfc commit 5f96c39
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/app/components/email-validation/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<sky-demo-page title="Email Validation">
<sky-demo-page title="Email validation">
<sky-demo-page-summary>
The email validation module allows the user to validate email format.
</sky-demo-page-summary>
Expand All @@ -11,7 +11,7 @@

<sky-demo-page-example>
<sky-email-validation-demo></sky-email-validation-demo>
<sky-demo-page-code demoName="Email Validation"></sky-demo-page-code>
<sky-demo-page-code demoName="Email validation"></sky-demo-page-code>
</sky-demo-page-example>

</sky-demo-page>
4 changes: 2 additions & 2 deletions src/app/components/text-expand/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<sky-demo-page title="Text Expand">
<sky-demo-page title="Text expand">
<sky-demo-page-summary>
<p>
The text expand component truncates long text with an ellipsis and a link that allows the user to fully expand the text.
Expand Down Expand Up @@ -44,7 +44,7 @@

<sky-demo-page-example>
<sky-text-expand-demo></sky-text-expand-demo>
<sky-demo-page-code demoName="Text Expand"></sky-demo-page-code>
<sky-demo-page-code demoName="Text expand"></sky-demo-page-code>
</sky-demo-page-example>

</sky-demo-page>
4 changes: 2 additions & 2 deletions src/app/learn/get-started/run-tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Run sample unit test
</stache-page-anchor>
<p>Unit tests scrutinize the smallest testable parts of an application. When you <a routerLink="/learn/get-started/3.-create-project">create a SKY UX project</a>, the template includes sample unit tests in the new project. You can follow the steps in this tutorial to run the unit test for the default single-page application.</p>
<sky-alert alertType="info">For information about unit tests in SKY UX, see <a routerLink="/learn/reference/tests">unit tests</a>, and for information about how to test modals in SKY UX, see <a routerLink="/learn/get-started/8.-unit-test-modals">write unit tests for modals</a>. For additional tips and techniques on testing Angular applications, see the <a href="https://angular.io/docs/ts/latest/testing/">Angular testing guidelines</a>.</sky-alert>
<sky-alert alertType="info">For information about unit tests in SKY UX, see <a routerLink="/learn/reference/tests">unit tests</a>, and for information about how to test modals in SKY UX, see <a routerLink="/learn/get-started/8.-unit-test-modals">write unit tests for modals</a>. For additional tips and techniques on testing Angular applications, see the <a href="https://angular.io/guide/testing">Angular testing guidelines</a>.</sky-alert>

<ol>
<li><p>To view the unit test spec files in a local editor, open the project's <stache-code>about.component.spec.ts</stache-code> file in the <stache-code>src/app/about</stache-code> folder and the <stache-code>home.component.spec.ts</stache-code> file in the <stache-code>src/app</stache-code> folder.</p>
Expand All @@ -29,7 +29,7 @@
</stache-page-anchor>

<p>End-to-end tests identify system dependencies and ensure that an application flows as expected from start to finish. When you <a routerLink="/learn/get-started/3.-create-project">create a SKY UX project</a>, the template includes a sample end-to-end test in the new project. You can follow the steps in this tutorial to run the end-to-end test for the default single-page application.</p>
<sky-alert alertType="info">For information about end-to-end tests in SKY UX, see <a routerLink="/learn/reference/tests">end-to-end tests</a>. And for tips and techniques on testing Angular applications, see the <a href="https://angular.io/docs/ts/latest/testing/">Angular testing guidelines</a>.</sky-alert>
<sky-alert alertType="info">For information about end-to-end tests in SKY UX, see <a routerLink="/learn/reference/tests">end-to-end tests</a>. And for tips and techniques on testing Angular applications, see the <a href="https://angular.io/guide/testing">Angular testing guidelines</a>.</sky-alert>

<ol>
<li><p>To view the end-to-end test spec file in a local editor, open the project's <stache-code>about.component.e2e-spec.ts</stache-code> file in the <stache-code>e2e</stache-code> folder at the root of the project.</p>
Expand Down
2 changes: 1 addition & 1 deletion src/app/learn/reference/helpers/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ul>
<li><p><stache-code>import &#123; SkyAuthHttp &#125; from '@blackbaud/skyux-builder/runtime</stache-code> — In conjunction with <a routerLink="/learn/reference/configuration">the <stache-code>"auth": true</stache-code> configuration setting in the <stache-code>skyuxconfig.json</stache-code> file</a>, we provide a wrapper to the <stache-code>http</stache-code> utility class. Use <stache-code>SkyAuthHttp.get()</stache-code> to automatically add the necessary Authorization header containing the bearer token received from authentication. This helper is for internal Blackbaud use only.</p></li>
<li><p><stache-code>import &#123; SkyHostBrowser &#125; from '@blackbaud/skyux-builder/runtime/testing</stache-code> — Particularly useful when running <a routerLink="/learn/reference/CLI-commands">the <stache-code>skyux e2e</stache-code> command in the SKY UX CLI</a>. Use <stache-code>SkyHostBrowser.get()</stache-code> to automatically add the SKY UX Host base URL, as well as the necessary configuration object to enable local development mode. For example, <stache-code>SkyHostBrowser.get(/my-page?my-qs=1');</stache-code>.</p></li>
<li><p><stache-code>import &#123; SkyHostBrowser &#125; from '@blackbaud/skyux-builder/runtime/testing</stache-code> — Particularly useful when running <a routerLink="/learn/reference/cli-commands">the <stache-code>skyux e2e</stache-code> command in the SKY UX CLI</a>. Use <stache-code>SkyHostBrowser.get()</stache-code> to automatically add the SKY UX Host base URL, as well as the necessary configuration object to enable local development mode. For example, <stache-code>SkyHostBrowser.get(/my-page?my-qs=1');</stache-code>.</p></li>
</ul>

</stache>
6 changes: 3 additions & 3 deletions src/app/learn/reference/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
Unit tests
</stache-page-anchor>
<p>SKY UX automatically configures <a href="https://karma-runner.github.io">Karma</a> to run unit tests in the <stache-code>src/app</stache-code> folder that match the <stache-code>.spec.ts</stache-code> pattern. We recommend that you follow the <a href="https://angular.io/styleguide#!#naming">Angular naming guidelines</a> on how to name spec files and where to store them. SKY UX unit tests should use the same name as the components or services that they test, but they should end with <stache-code>.spec.ts.</stache-code> And you place the spec files in the same folder as the components or services that they test. When you run <stache-code>skyux test</stache-code> or <stache-code>skyux watch</stache-code>, code coverage results are stored in the <stache-code>coverage</stache-code> folder.</p>
<p>When you <a routerLink="/learn/get-started/3.-create-project">create a SKY UX project</a>, the template includes sample unit tests that <a routerLink="/learn/get-started/7.-run-tests">you can run to test the default single-page-application</a>. From the command line, you can use <a routerLink="/learn/reference/CLI-commands">the <stache-code>skyux test</stache-code> command</a> to run unit tests and <a routerLink="/learn/reference/CLI-commands">the <stache-code>skyux watch</stache-code> command</a> to run unit tests and watch the file system for changes.</p>
<p>When you <a routerLink="/learn/get-started/3.-create-project">create a SKY UX project</a>, the template includes sample unit tests that <a routerLink="/learn/get-started/7.-run-tests">you can run to test the default single-page-application</a>. From the command line, you can use <a routerLink="/learn/reference/cli-commands">the <stache-code>skyux test</stache-code> command</a> to run unit tests and <a routerLink="/learn/reference/cli-commands">the <stache-code>skyux watch</stache-code> command</a> to run unit tests and watch the file system for changes.</p>
<p>SKY UX styles are loaded when running unit tests, so CSS rules defined in SKY UX take effect during tests. This allows you to check the expected computed style of an element when using things like the HTML <stache-code>hidden</stache-code> property that only take effect when SKY UX styles are loaded.</p>
<sky-alert alertType="info">For tips and techniques on testing Angular applications, see the <a href="https://angular.io/docs/ts/latest/testing/">Angular testing guidelines</a>. And for information about how to test modals in SKY UX, see <a routerLink="/learn/get-started/8.-unit-test-modals">write unit tests for modals</a>.</sky-alert>
<sky-alert alertType="info">For tips and techniques on testing Angular applications, see the <a href="https://angular.io/guide/testing">Angular testing guidelines</a>. And for information about how to test modals in SKY UX, see <a routerLink="/learn/get-started/8.-unit-test-modals">write unit tests for modals</a>.</sky-alert>

<stache-page-anchor>
End-to-end (e2e) tests
</stache-page-anchor>
<p>SKY UX automatically configures <a href="http://www.protractortest.org">Protractor</a> to run end-to-end tests in the <stache-code>e2e</stache-code> folder that match the <stache-code>.e2e-spec.ts</stache-code> pattern. We recommend that you follow the <a href="https://angular.io/styleguide#!#naming">Angular naming guidelines</a> on how to name spec files and where to store them. SKY UX end-to-end tests should use the same name as the components or services that they test, but they should end with <stache-code>.e2e-spec.ts.</stache-code> Unlike unit tests, you should not place these spec files in the same folder as the components or services that they test. Instead, you should place them in the <stache-code>e2e</stache-code> folder in the root of your project.</p>
<p>When you <a routerLink="/learn/get-started/3.-create-project">create a SKY UX project</a>, the template includes a sample end-to-end test that <a routerLink="/learn/get-started/7.-run-tests">you can run to test the default single-page application</a>. From the command line, you can use <a routerLink="/learn/reference/CLI-commands">the <stache-code>skyux e2e</stache-code> command</a> to run end-to-end tests.</p>
<sky-alert alertType="info">For tips and techniques on testing Angular applications, see the <a href="https://angular.io/docs/ts/latest/testing/">Angular testing guidelines</a>.</sky-alert>
<sky-alert alertType="info">For tips and techniques on testing Angular applications, see the <a href="https://angular.io/guide/testing">Angular testing guidelines</a>.</sky-alert>

</stache>
2 changes: 1 addition & 1 deletion src/app/learn/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Key tools and technologies
</stache-page-anchor>
<ul>
<li><p><strong>Angular</strong> — Angular is the key building block of SKY UX 2. Check out the <a href="https://angular.io/docs/ts/latest/">Angular docs</a>, and see <a href="https://angular.io/docs/ts/latest/guide/learning-angular.html">Learning Angular</a> for a suggested path for Angular newcomers. A <a href="http://www.angular2.com/">curated list of Angular resources</a> provides additional tutorials, courses, and other learning material. And for a guide to Angular syntax, conventions, and application structure, see the <a href="https://angular.io/styleguide">Angular Style Guide</a>.</p></li>
<li><p><strong>Angular</strong> — Angular is the key building block of SKY UX 2. Check out the <a href="https://angular.io/docs/ts/latest/">Angular docs</a>, and see <a href="https://angular.io/guide/quickstart">the Getting Started guide</a> for a suggested path for Angular newcomers. A <a href="http://www.angular2.com/">curated list of Angular resources</a> provides additional tutorials, courses, and other learning material. And for a guide to Angular syntax, conventions, and application structure, see the <a href="https://angular.io/styleguide">Angular Style Guide</a>.</p></li>
<li><p><strong>Node.js</strong> — Node is a JavaScript runtime that is a prerequisite for SKY UX Builder. Node.js uses an event-driven, nonblocking I/O model to build scalable network applications. For more information, see the <a href="https://nodejs.org/en/">Node.js website</a>.</p></li>
<li><p><strong>NPM</strong> — NPM is a package manager for JavaScript that runs through the command line and manages dependencies. NPM is the default for Node.js, and it is a prerequisite for SKY UX Builder. For more information, see the <a href="https://www.npmjs.com/">NPM website</a>.</p></li>
<li><p><strong>Git</strong> — Git is an open source distributed version control system, and you need to create Git repos for your SKY UX 2 projects. For more information, see <a href="https://git-scm.com/documentation"> the Git documentation</a>, explore the <a href="https://git-scm.com/docs/gittutorial">introduction tutorial</a>, or check out GitHub's <a href="https://guides.github.com/activities/hello-world/">hello world project</a>.</p></li>
Expand Down

0 comments on commit 5f96c39

Please sign in to comment.