Skip to content

Commit db2e420

Browse files
committed
addressing PR feedback
1 parent 36fed41 commit db2e420

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,14 @@ sbt test
157157
```
158158

159159
#### Run tests in intellij
160-
In `Run` -> `Edit Configurations...`, make sure the ScalaTest template has `VM Parameters` filled in with:
160+
Set up ScalaTest Template:
161+
162+
You need to set some default VM parameters for ScalaTest run configurations. In IntelliJ, go to `Run` > `Edit Configurations...`, select `ScalaTest` under `🔧Templates`, and add these VM parameters:
161163
```
162164
-Dpostgres.host=localhost -Dpostgres.port=5432 -Ddirectory.url=ldap://localhost:3389 -Ddirectory.password=testtesttest
163165
```
166+
Then you can run unit tests within IntelliJ by clicking the green play button on a unit test.
167+
164168

165169
#### Cleaning up after tests
166170
```

automation/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ See [firecloud-automated-testing](https://github.com/broadinstitute/firecloud-au
1111

1212
#### Render configs
1313

14-
##### Against dev fiab Sam
14+
##### Against a fiab Sam
1515
```bash
1616
./render-local-env.sh
1717
```
1818

19-
##### Against local UI pointing to dev fiab Sam
19+
##### Against local UI pointing to a fiab Sam
2020
```bash
2121
LOCAL_UI=true ./render-local-env.sh
2222
```
2323

24-
##### Against local Sam pointing to the dev live env
24+
##### Against a local Sam
2525
Run `./render-local-env.sh` and then update `samApiUrl` in application.conf to:
2626
```
2727
samApiUrl = "https://local.broadinstitute.org:50443/"
@@ -31,9 +31,10 @@ Run `./render-local-env.sh` and then update `samApiUrl` in application.conf to:
3131
All test code lives in `automation/src/test/scala`.
3232

3333
#### From IntelliJ
34-
It is recommended to `Open...` IntelliJ to the `automation` folder directly and import from SBT.
34+
To run tests from IntelliJ, it is recommended to load the project from the `automation` folder instead of the `sam` root folder.
35+
To do this, go to `File` -> `Open...` and navigate __into__ the `automation` folder, click `Open` to accept, and then import from SBT.
3536

36-
First, you need to set some default VM parameters for ScalaTest run configurations. In IntelliJ, go to `Run` > `Edit Configurations...`, select `ScalaTest` under `Templates`, and add these VM parameters:
37+
You need to set some default VM parameters for ScalaTest run configurations. In IntelliJ, go to `Run` > `Edit Configurations...`, select `ScalaTest` under `🔧Templates`, and add these VM parameters:
3738

3839
```
3940
-Djsse.enableSNIExtension=false

0 commit comments

Comments
 (0)