From 75d0903317a3f2db3c91ea3a7abace073825da75 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 24 Nov 2016 17:48:25 +0000 Subject: [PATCH 1/2] Add .env.test It took me ages to get Mastodon set up with the tests passing because the environment variables I needed to define weren't documented and I had to work them out one at a time. This change adds a .env.test file, and makes it so it isn't ignored by git. I think it makes sense for the .env.test file to be in git, since there's nothing secret in it, but other approaches would be to have a .env.test.sample (like the corresponding one for production), or to set these values in a test helper, or to adapt the tests to work with environments other than this one. I'd be happy to make these changes if that would be preferred. Being able to get set up and run the tests is a pretty important part of being able to contribute to Mastodon (or your test coverage with suffer!), so having some sort of solution like this one is vital. --- .env.test | 6 ++++++ .gitignore | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .env.test diff --git a/.env.test b/.env.test new file mode 100644 index 00000000000..41c4fa39cf8 --- /dev/null +++ b/.env.test @@ -0,0 +1,6 @@ +# Service dependencies +NEO4J_PORT=7575 + +# Federation +LOCAL_DOMAIN=cb6e6126.ngrok.io +LOCAL_HTTPS=true diff --git a/.gitignore b/.gitignore index 5dabc59d942..a60603c7d42 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,6 @@ coverage public/system public/assets .env -.env.* +.env.production node_modules/ neo4j/ From 157fd07edc4999f33881b7cb85ed12f236538458 Mon Sep 17 00:00:00 2001 From: Eugen Date: Tue, 29 Nov 2016 17:51:16 +0100 Subject: [PATCH 2/2] Update .env.test --- .env.test | 3 --- 1 file changed, 3 deletions(-) diff --git a/.env.test b/.env.test index 41c4fa39cf8..b57f52e309b 100644 --- a/.env.test +++ b/.env.test @@ -1,6 +1,3 @@ -# Service dependencies -NEO4J_PORT=7575 - # Federation LOCAL_DOMAIN=cb6e6126.ngrok.io LOCAL_HTTPS=true