Skip to content

Commit

Permalink
Merge branch 'release/4.1.13'
Browse files Browse the repository at this point in the history
* release/4.1.13: (22 commits)
  Fixed the new path for loading migrations
  wip
  Remove the unused factories
  minor updates
  Added to the changelog
  Added a changelog
  Updated the gitignore
  Apply fixes from StyleCI (#446)
  Added a helper unit test for suffixed numbers
  wip
  Apply fixes from StyleCI (#445)
  wip
  minor updates
  asset compiling
  wip
  Added some padding around the cta
  Apply fixes from StyleCI (#444)
  wip
  Apply fixes from StyleCI (#443)
  wip
  ...
  • Loading branch information
austintoddj committed Mar 21, 2019
2 parents efc6cb0 + f56af45 commit 2f61d32
Show file tree
Hide file tree
Showing 36 changed files with 6,976 additions and 512 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
*.css linguist-vendored
*.scss linguist-vendored
*.js linguist-vendored
*.blade.php linguist-language=PHP
*.blade.php linguist-language=PHP
changelog.md export-ignore
16 changes: 7 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/vendor
/node_modules
composer.phar
.DS_Store
Thumbs.db
/phpunit.xml
/vendor
/.idea
/.vscode
.phpunit.result.cache
*.cache
*.lock
composer.lock
npm-debug.log
yarn-error.log
.DS_Store
Thumbs.dbg
.phpunit.result.cache
11 changes: 11 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Release Notes

## [v4.1.13](https://github.com/cnvs/canvas/compare/v4.1.12...v4.1.13)

### Added
- Added unit tests for the number suffix helper ([61d5b15](https://github.com/cnvs/canvas/commit/61d5b15eaee6bdf9571e5687cca9f80d4e309fe3))

### Changed
- Refactored the test suite to be more concise and accurate ([573b6e8](https://github.com/cnvs/canvas/commit/573b6e877933fc4e0d2ef46a0686650304b5a9f8))
- Refactored the migrations into a root `database` directory ([573b6e8](https://github.com/cnvs/canvas/commit/573b6e877933fc4e0d2ef46a0686650304b5a9f8))
- Updated the `.gitignore` ([a83978b](https://github.com/cnvs/canvas/commit/a83978b63fe2d1e4b25551cd9bf81a3f9ecbb908))
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"authors": [
{
"name": "Todd Austin",
"email": "[email protected]",
"role": "Developer"
"email": "[email protected]"
}
],
"require": {
Expand Down
19 changes: 8 additions & 11 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="tests/bootstrap.php"
beStrictAboutTestsThatDoNotTestAnything="true"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
Expand All @@ -13,20 +13,17 @@
verbose="true"
>
<testsuites>
<testsuite name="Canvas Unit Test Suite">
<directory suffix="Test.php">./tests/Unit</directory>
</testsuite>

<testsuite name="Canvas Integration Test Suite">
<directory suffix="Test.php">./tests/Integration</directory>
<testsuite name="Canvas Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
<exclude>
<directory suffix=".blade.php">./src/</directory>
</exclude>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing"/>
<env name="APP_KEY" value="base64:cnx7anOUDil+KtEGdGiHBnY764aA05eU80oECtOqfYs="/>
</php>
</phpunit>
17 changes: 16 additions & 1 deletion public/css/app.css

Large diffs are not rendered by default.

Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 2f61d32

Please sign in to comment.