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

Commit

Permalink
Rc ng4 upgrade (#865)
Browse files Browse the repository at this point in the history
* Ng4 upgrade (#799)

* Package upgrades

* Fixed tslint issues

TODO:
  - fix search and sort tests

* Update package.json

* Fix context replacement plugin

* Remove forkCheckerPlugin from webpack

* Fix contentBase error

* fix sort test add logging back to karma.conf

* Fix search tests

TODO:
  - fix code coverage gaps

* Fix lint errors

* ignore new istanbul quirks

* update rollup to include platform browser name

* Angular 4 Upgrade > Additional Edits (#702)

* Allow for proper nesting for getting data for lists and grids (#671)

* Changed the list helper getData function to set the result to null if the final part was undefined so that nesting works correctly.

* Added unit tests

* updates skyux2 docs to use stache2 (#681)

* home page and pulling in stache things

* removed need for title service

* components demo component using stache

* removed change to package json

* removed unecessary method

* updating learn page and removing overview folder

* spacing issue fixed

* Convert reference topics to Stache 2

* refactored all the tutorial section

* Doc tweaks for Stache 2.

* Final doc tweaks before merge

* versioned without vs

* Update builder version (#693)

* Update builder version

* Remove unneeded packages

* Update full page modal header sizes (#679)

* Update full page modal header sizes

* Update full screen modal screenshots

* Travis build 1313 pushed to skyux2 [ci skip]

* Update wait component z-index (#684)

* Travis build 1316 pushed to skyux2 [ci skip]

* Adjust padding for closeable tab (#685)

To account for built-in padding in the close button.

* Travis build 1318 pushed to skyux2 [ci skip]

* Handle styles for filedrop when links are not allowed (#686)

* Travis build 1325 pushed to skyux2 [ci skip]

* Add cancel button to wizard docs and update modal button spacing (#689)

* Added yarn lock

* Cleaned files based on lint rules

* Removed unused comments

* Updated excluded source maps

* Updated version of tslint

* Fixed linting errors

* Reverting version of browserstack-local

* Update to connect to browserstack properly

Use browserstack service instead of binary. Also fix error with axe.

* Fix variable name

* Bump tests

* Remove unit tests to test visual tests on their own

* Actually remove unit tests for ci to run visuals

* Use one parallel test

* Add error logs for wdio

* Add unit tests back

* Log build number for visual tests on ci

* Add logs to see what's going on

* Try to use travis browsersrtack addon

* try using travis browserstack again

* remove old browserstack stuff

* Use encrypted variables with travis browserstack

* Add more logging and use different travis encryption

* Add more logging

* Add more logging to webdriver

* Add more logging

* Tweak visual server settings

* try running visual test webpack dev server

* set noInfo to false

* update host for dev server

* use local browserstack wdio

* see what error occurs when using nonsense text

* Add env variables back

* Add more wdio configuration

* Use browserstack binary

* Remove extra options from visual-server

* Remove unneeded logging

* make log level silent

* Run entire test suite

Revert normalize-sass to original version

* use old wdio versions for testing

* Add connection retry settings

* whitespace bump

* Re update wdio packages

* Remove unneeded logging

* Remove parallel testing

* Use sudo required for builds

* remove reference to browserstack-local

* See how 25 parallel tests run

* Use 3 parallel visual tests and latest stable version of node

* Update visual-server.js

* Update travis-script.sh

* Updated formatting

* More adjustments

* Added console logs

* Added error checking

* Added logs

* Reduced number of instances

* Updated logs

* Updated log

* Updated logs

* Updates

* Removed console logs

* Changed styles for visual test

* Updated wait test

* Updates to private variables

* Updated list toolbar default

* Updated public variable

* Updating selenium version

* Fixed bugs with templates

* Cleaned up unnecessary changes

* Updated version of stache

* Upped max instances

* Up wait for timeout

* Add some waitForVisibles in alert and action button

* Added path resolves

* Builder visual (#791)

* Add start of visual tests

* continue working on skyux builder visual tests

* more work on getting builder visual tests to work

* More work around visual tests

* fix package name typo

* Update import paths for visual test spa

* Add normalize-scss to package.json

* Fix moment import to work with rollup

This way works also with copying the dist folder to node_modules

* fix tile strangeness

* start scripts for visual test setup

* Continue protractor work

* start of visual test command

* duplicate a bit of work to get protractor ready to go

* Get protractor to go to a page

* Add first pass at image comparison

TODO:
  - do not fail when image does not exist

* Continue pixdiff work

* Work on thresholds

* Screenshots working with alert visual test

TODO:
  - create compare screenshot wrapper function
  - get action button tests
  - get working with browserstack
  - get working with browserstack and TravisCI

* Add wrapper function for visual tests

TODO:
  - accessibility testing
  - more elegant way to change size
  - use browserstack
  - travis commands

* Add checkAccessibility

TODO:
  - browserstack configuration
  - get working in travis

* Break out local visual test conf file

* Add content for ci visual tests

TODO:
  - switch configuration file used based on argue
  - test using browserstack
  - add the rest of the tests
  - get TravisCI implementations working

* Allow visual tests to change config based on command line

* Browserstack tests working

* fix browserstack local visual tests

TODO:
  - get other tests moved over
  - test using browserstack
  - get TravisCI integration working
  - remove all traces of wdio and old tests

* Add avatar visual test

* Add button visual test

* Add visual tests for card, checkbox, and chevron

* Add datepicker, definition list, and dropdown visual tests

* Add error, file drop, and filter visual tests

* Add visual tests for grid, key-info, label, list-secondary-actions, list-view-checklist, and modals

* add visual tests for navbar

* Add page summary visual tests

* Add visual tests for paging, radio, repeater

* Add visual tests for search, sort, tabs

* Add visual tests for text-expand, text-expand-repeater, tiles

* Finsih visual tests

* Updated visual tests

* Update ci tests

* fix package.json conflict

* update other visual test scripts

* Tweak scripts

* Fix lint errors

* Attempt to add path for skyux/dist/core

* Updated stache version

* ignore temporary visual test files

* Update code coverage

* Remove some old visual tests

* Remove old visual test artifacts

* Remove other old visual test artifacts

* remove webdriver packages from package.json

* Update documentation for visual tests

* Finish documentation for new visual test methodology

* Fix visual test selector in new modal tests

* Updated version of Stache (#805)

* Updated version of stache

* Add tsconfig ignore for visual tests

* Hit release candidate branch

* Fix build errors

* Update baseline screenshots in travis scripts

* white space bump

* update travis scripts (#806)

* update travis scripts

* update visual baseline script

* Update visual baseline with logging (#807)

* Travis build 1644 pushed to skyux2 [ci skip]

* Changelog and package updates for rc.0 (#808)

* Merge 32 (#816)

* AppSettings and config files docs.

* appSettings and config files docs.

* Doc tweaks.

* Code sample cleanup

* Max height transition (#804)

* update builder version for skyux documentation

* pass string to expandmode

* Update container for component search

* Use class instead of inline styles

* work on text expand firefox bug

* continue work on firefox transitions

* Adjust text expand animation for firefox

* Update tests for new text expand animation

* Fix tslint errors

* Update master plunker to point to beta release (#812)

* List paging first page (#814)

* Only set page number on search when paging exists

* Add tests for search paging bug

* Updates for beta.32 (#815)

* Fix typo for iso8601

* Update dependencies for spa visual tests

* Updates for rc.1 (#817)

* Updates for rc.1

* Tweak changelog styles

* Update karma firefox (#818)

* Drop down primary (#819)

* added primary in html class

* testing for primary dropdown option

* lint errors fixed

* documentation fixes from john

* documentation changes

* changed isPrimary boolean property to buttonStyle string property

* fixed test errors

* Updated versions of Stache, Builder (#821)

* Updated version of stache

* Add tsconfig ignore for visual tests

* Hit release candidate branch

* Fix build errors

* Update baseline screenshots in travis scripts

* white space bump

* Update package.json

* Update package.json

* Update package.json

* Updated releases

* Updated version of stache

* Updated version of stache

* Added resolve for visual tests

* Updated version of stache

* Merging master branch, Release 2.0.0-beta.2 (#826)

* AppSettings and config files docs.

* appSettings and config files docs.

* Doc tweaks.

* Code sample cleanup

* Max height transition (#804)

* update builder version for skyux documentation

* pass string to expandmode

* Update container for component search

* Use class instead of inline styles

* work on text expand firefox bug

* continue work on firefox transitions

* Adjust text expand animation for firefox

* Update tests for new text expand animation

* Fix tslint errors

* Update master plunker to point to beta release (#812)

* List paging first page (#814)

* Only set page number on search when paging exists

* Add tests for search paging bug

* Updates for beta.32 (#815)

* Adding Autonumeric Pipe/Module (#792)

* Adding Autonumeric

* Fixed Test

* Changed name from SkyAutonumeric to  SkyNumeric

* Changing formatting

* Changes per comments, OptionsObject used

* Updated wording

* Email validation (#810)

* created email validation ts

* email validation scss

* email validation code and test start

* email validator testing files

* last lint error fixed

* component page summary

* error message/red halo doesn't show until lost focus

* Changes from Patrick

* Changes from Patrick (took care of errors)

* added form control for demo input box consistency

* Fixed lint errors

* Added sky-form-control to demo/removed onInit from module code

* Lint errors

* Add note about serving in Windows 10 with IE11 or Edge. (#820)

* Add note about serving in Windows 10 with IE11 or Edge.

* Rework note based on feedback from Bobby.

* Updates for beta.33 (#825)

* Fixed linting errors

* Update package.json

* Dont run skyux build for now

* Updated travis script

* Readded build

* Moved remove commands

* Updated version of builder

* Updated changelog and version

* Tab keyboard support (#843)

* Added animation polypill

* Moved import to dependencies

* Tab keyboard accessibility

* Added animation polyfill (#841)

* Added animation polypill

* Moved import to dependencies

* Text Highlight directive (#839)

* Adding highlight directive and demo page.

* Adding and replacing highlight style.

* Use mark element.

* Update demo.

* Add test for directive.

* Update test.

* Update highlighter to be case insensitive.

* Can't add mark text to innerhtml.

* Update tests.

* Use mutation observer for dom events.

* Reformat test

* Update async test.

* Mock mutation observer service.

* Add extra test.

* Adding visual tests.

* Add text highlight visual test.

* Move mutation service class.

* Update event creation in test.

* Adding test for mutation observer class. Removing undefined check for IE10.

* Disconnect mutation observer on destroy. Add exports. Fix name.

* Update angular to 4.2.5 (#850)

* AppSettings and config files docs.

* appSettings and config files docs.

* Doc tweaks.

* Code sample cleanup

* Max height transition (#804)

* update builder version for skyux documentation

* pass string to expandmode

* Update container for component search

* Use class instead of inline styles

* work on text expand firefox bug

* continue work on firefox transitions

* Adjust text expand animation for firefox

* Update tests for new text expand animation

* Fix tslint errors

* Update master plunker to point to beta release (#812)

* List paging first page (#814)

* Only set page number on search when paging exists

* Add tests for search paging bug

* Updates for beta.32 (#815)

* Adding Autonumeric Pipe/Module (#792)

* Adding Autonumeric

* Fixed Test

* Changed name from SkyAutonumeric to  SkyNumeric

* Changing formatting

* Changes per comments, OptionsObject used

* Updated wording

* Email validation (#810)

* created email validation ts

* email validation scss

* email validation code and test start

* email validator testing files

* last lint error fixed

* component page summary

* error message/red halo doesn't show until lost focus

* Changes from Patrick

* Changes from Patrick (took care of errors)

* added form control for demo input box consistency

* Fixed lint errors

* Added sky-form-control to demo/removed onInit from module code

* Lint errors

* Add note about serving in Windows 10 with IE11 or Edge. (#820)

* Add note about serving in Windows 10 with IE11 or Edge.

* Rework note based on feedback from Bobby.

* Updates for beta.33 (#825)

* Update link (#837)

* Fix timepicker demo (#847)

* Fix timepicker demo

* Remove unneeded whitespace

* Update angular to 4.2.5

Also update to latest version of state and skyux-builder

* Add ignore around branch

* Travis build 1744 pushed to skyux2 [ci skip]

* Updates for 2.0.0-rc.3 (#851)

* Updates for 2.0.0-rc.4 (#852)
  • Loading branch information
Blackbaud-PatrickOFriel authored Jul 5, 2017
1 parent d1dfa67 commit 128e77f
Show file tree
Hide file tree
Showing 602 changed files with 3,967 additions and 3,378 deletions.
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Thumbs.db
/node_modules
/bower_components
npm-debug.log*
yarn.lock

# Coverage #
/coverage/
Expand Down Expand Up @@ -66,6 +67,12 @@ npm-debug.log*
/.skypagestmp
webdriver-screenshotslocal*
browserstack.err
/skyux-spa-visual-tests/dist/
/skyux-spa-visual-tests/node_modules/

browserstack-binary/BrowserStackLocal

skyux-spa-visual-tests/dist
skyux-spa-visual-tests/node_modules
skyux-spa-visual-tests/screenshots-baseline-local
skyux-spa-visual-tests/screenshots-diff-local
skyux-spa-visual-tests/screenshots-created-local

9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
language: node_js
node_js:
- "6.1"
- "6.10.3"

# https://docs.travis-ci.com/user/customizing-the-build/#Git-Clone-Depth
git:
depth: 10

sudo: required

# https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
addons:
apt:
Expand All @@ -32,6 +34,11 @@ before_install:
- chmod +x ./scripts/visual-baseline.sh
- chmod +x ./scripts/visual-failures.sh

after_install:

- sudo cp .node_modules/@blackbaud/skyux-builder/ssl/skyux-ca.crt /usr/local/share/ca-certificates/skyux-ca.crt
- sudo update-ca-certificates

script: ./scripts/travis-script.sh
after_script: ./scripts/travis-after-script.sh
after_success:
Expand Down
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,45 @@
# 2.0.0-rc.4 (2017-06-24)

- Fix npm release error.

# 2.0.0-rc.3 (2017-06-24)

- Added keyboard support for tab component. (#188) (Thanks @Blackbaud-SandhyaRajasabeson)
- Added animation polyfill for increased browser support. (#803) (Thanks @Blackbaud-SandhyaRajasabeson)
- Added text highlight directive. (#775)

### Library updates

- Added support for Angular 4.2.5 to fix some angular animation issues, see https://github.com/angular/angular/blob/master/CHANGELOG.md for more information.

# 2.0.0-rc.2 (2017-06-23)

- All the updates for 2.0.0-beta.33.
- Added support for SKY UX Builder 1.0.0-rc.3.

# 2.0.0-beta.33 (2017-06-23)

- Added the SkyNumeric Pipe. (#764) (Thanks @Blackbaud-AdamSc)
- Added the email validation directive. (#379) (Thanks @Blackbaud-SandhyaRajasabeson)

# 2.0.0-rc.1 (2017-06-20)

- All the updates for 2.0.0-beta.32.

### Breaking changes

- Fixed typo to change SkyTimepickerTimeOutput `ios8601` property to be `iso8601`.

# 2.0.0-beta.32 (2017-06-20)

- Tweaked animation for text-expand in firefox. (#695)
- Handle search when paging does not exist. (#813)

# 2.0.0-rc.0 (2017-06-16)

- Updated dependencies to support Angular 4.1.3. (#549) See http://angularjs.blogspot.com/2017/03/angular-400-now-available.html and https://github.com/angular/angular/blob/master/CHANGELOG.md for more information.
- Updated visual test process for SKY UX 2.

# 2.0.0-beta.31 (2017-06-14)

- Added ability to specify sizes for modals. (#489) (Thanks @Blackbaud-AdamHickey)
Expand Down
24 changes: 8 additions & 16 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,17 @@ As your tests run, code coverage results are generated and can be located under

### Write visual regression tests

During our continuous integration builds, we run visual regression tests through BrowserStack using [webdriverio](http://webdriver.io/) and [wdio-visual-regression-service](https://github.com/zinserjan/wdio-visual-regression-service). To run these tests locally, you need [GraphicsMagick](http://www.graphicsmagick.org/) for image processing installed on your system.
During our continuous integration builds, we run visual regression tests through BrowserStack using [protractor](http://www.protractortest.org/) and [pix-diff](https://github.com/koola/pix-diff).

##### Mac OS X using [Homebrew](http://mxcl.github.io/homebrew/)
```sh
$ brew install graphicsmagick
```

##### Ubuntu using apt-get
```sh
$ sudo apt-get install graphicsmagick
```

##### Windows
After you install these prerequisites, you can run the visual regression tests using `npm run test:visual`, which creates and compares screenshots in the `skyux-spa-visual-tests/screenshots-baseline-local/` folder.

Download and install executables for [GraphicsMagick](http://www.graphicsmagick.org/download.html). Make sure to install the right binaries desired for your system (32bit vs 64bit).
To create visual tests for a new component, first create a folder for the tests in `skyux-spa-visual-tests/src/app`. This folder will contain four files for the visual test:
- {componentName}-visual.component.html : The template for the component to render and screenshot.
- {componentName}-visual.component.ts : The typescript code for the component to render and screenshot.
- {componentName}.visual-spec.ts : The protractor code to run the screenshot tests.
- index.html : The route file that contains the component to render and screenshot.

After you install these prerequisites, you can run the visual regression tests using `npm run test:visual`, which creates and compares screenshots in the `webdriver-screenshotslocal` folder.
Then, in `skyux-spa-visual-tests/src/app/home.component.ts`, add the name of the test folder you just created to the `tests` array.

### Submit the code

Expand All @@ -90,8 +84,6 @@ Script | Description
`test` | Runs unit tests and visual regression tests.
`test:unit` | Runs Karma unit tests.
`test:visual` | Runs Webdriver visual regression tests.
`start` | Serves the components at [http://localhost:3000](http://localhost:3000) for debugging.
`start:visual`| Serves the visual fixtures at [http://localhost:3000](http://localhost:3000) for debugging.
`watch` | Runs Karma unit tests and watch for file changes.


Expand Down
14 changes: 7 additions & 7 deletions config/karma/ci.karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ module.exports = function (config) {
browser: 'chrome',
os: 'OS X',
os_version: 'Sierra'
}//,
// bs_osx_firefox_latest: {
// base: 'BrowserStack',
// browser: 'firefox',
// os: 'OS X',
// os_version: 'Sierra'
// }
},
bs_osx_firefox_latest: {
base: 'BrowserStack',
browser: 'firefox',
os: 'OS X',
os_version: 'Sierra'
}
};

config.set({
Expand Down
6 changes: 5 additions & 1 deletion config/karma/shared.karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ module.exports = function (config) {
browserDisconnectTimeout: 3e5,
browserDisconnectTolerance: 3,
browserNoActivityTimeout: 3e5,
captureTimeout: 3e5
captureTimeout: 3e5,
browserConsoleLogOptions: {
level: 'log',
terminal: true
}
});
};
1 change: 1 addition & 0 deletions config/rollup/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export default {
'@angular/router': 'ng.router',
'ng2-dragula/ng2-dragula': 'ng2.dragula',
'@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
'@angular/platform-browser': 'ng.platformBrowser',
'moment': 'moment'
},
external: [
Expand Down
148 changes: 0 additions & 148 deletions config/utils/visual-browser-commands.js

This file was deleted.

Loading

0 comments on commit 128e77f

Please sign in to comment.