Skip to content

Commit

Permalink
Merge pull request #22 from inakianduaga/develop
Browse files Browse the repository at this point in the history
Added Aws S3 driver tests
  • Loading branch information
Inaki Anduaga committed Jan 26, 2015
2 parents b014568 + e3eb1cd commit 0200f80
Show file tree
Hide file tree
Showing 10 changed files with 336 additions and 92 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ coverage
#build related
gulp
node_modules

tests/storage/files/*
tests/storage/meta/*

# Test AWS credentials
tests/src/.env

#Keep special .gitkeep file, useful for keeping empty directory structure
!.gitkeep
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,13 @@ script:

after_script:
- php vendor/bin/coveralls

# Setup environment to pass AWS S3 credentials
env:
global:
- AWS_S3_REGION="eu-west-1"
- AWS_S3_BUCKET="github-ci-test"
- AWS_S3_BUCKET_SUBFOLDER="files"
# Encrypted AWS_S3_KEY, AWS_S3_SECRET
- secure: fyTrGJ0tuP9i+WxWSz6M7VjpzKot5Lvp1t/KDoCtjE1h5U5FBaQ/W7mITj3lja79ZLOeL6rgCNdPR+5aUPjcVGvGWTs4VsbL6AUMql5XmK3hHb25/S0LgItnsFoPpp2XuptPyjo2k1RXGJfU8ImZCCY80WscKimuIMqMukcmQWE=
- secure: GUza74BlQMzxu5UKtSXx7J0t2HOMHYVh61PC5PqPZF6IzUuI5sfEkt5WhYM3vyAZ/wMzzO0sIGZKUhWIZVG9QxTMgwdGtUGJyoz66f96ebQcRtGdPHfBGwWfUzsYtPiXBgao2KTLm0iKEGw9gST67zXBg17z11wadyiVv6NoKwc=
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@ There are several commands related to testing

Both options have the ability to generate a code coverage report in different formats. When this is selected, a local server will be launched to visualize the coverage report

### Testing AWS S3 Driver

- Valid AWS S3 credentials need to be provided via `tests/.env` file, see `tests/.env.example` as an example.
- Travis CI integration is performed by passing encrypted credentials in travis.yml (valid only for inakianduaga/eloquent-external-storage repo).
- [Amazon S3 testing in Travis CI](http://milesj.me/blog/read/amazon-s3-testing-travis-ci)

[travis-url]: https://travis-ci.org/inakianduaga/eloquent-external-storage
[travis-image]: https://travis-ci.org/inakianduaga/eloquent-external-storage.svg?branch=master
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"phpunit/phpunit": "4.3.*@dev",
"mockery/mockery": "dev-master",
"orchestra/testbench" : "2.2.x",
"satooshi/php-coveralls": "dev-master"
"satooshi/php-coveralls": "dev-master",
"vlucas/phpdotenv" : "dev-master"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 0200f80

Please sign in to comment.