From 3233c1d1897735244e00dd58ee539cd91694ced3 Mon Sep 17 00:00:00 2001 From: akiraandy Date: Fri, 13 Apr 2018 09:46:50 -0500 Subject: [PATCH 1/4] Add instructions for integrating CI with cob_spec in README.md --- README.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/README.md b/README.md index ddb0743..44eed80 100644 --- a/README.md +++ b/README.md @@ -52,3 +52,29 @@ Running Tests - To run the simple http request tests, first click the ResponseTestSuite link, then click the Suite button. - To run the tests that require threading, first click the SimultaniousTestSuite link, then click the Suite button. - To run a test individually, first click on the test link, then click the Test button. + +Adding CI +------------ +- Fork cob spec +- On your local machine navigate to your server's directory +- Create a submodule using the forked copy of cob spec `git submodule add https://github.com/myusername/cob_spec` +- Within this new submodule navigate to `FitNesseRoot` and create a new directory `mkdir PassingTests` +- Copy contents of `HttpTestSuite` into your new directory `PassingTests` by issuing the following command `cp -r HttpTestSuite/ PassingTests/` +- Navigate into `PassingTests/ResponseTestSuite` and add/remove cob spec tests as necessary +- To add a test to the `PassingTests`: `cp -r HttpTestSuite/ResponseTestSuite/SimpleGet PassingTests/ResponseTestSuite/SimpleGet/` +- To remove a test in `PassingTests`: `rm -rf PassingTests/ResponseTestSuite/SimpleGet/` +- Navigate to your server's directory. Create a new `.sh` file `touch run_cob_spec_tests.sh` +- Open the file and add the follwing: + `#!/bin/bash + set -e + cd cob_spec + mvn package + java -jar fitnesse.jar -c "PassingTests?suite&format=test" + ` +- The following CI instructions are for TravisCI but follow a similar pattern for other CI platforms. In .travis.yml: + `before_install: + - chmod +x run_cob_spec_tests.sh + script: + - "./run_cob_spec_tests.sh" + ` +- Push branch and run the build From 729ab5945308df982568a5e74aac92a47f2527cd Mon Sep 17 00:00:00 2001 From: akiraandy Date: Fri, 13 Apr 2018 09:49:48 -0500 Subject: [PATCH 2/4] change some formatting" --- README.md | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 44eed80..8980bd7 100644 --- a/README.md +++ b/README.md @@ -65,16 +65,21 @@ Adding CI - To remove a test in `PassingTests`: `rm -rf PassingTests/ResponseTestSuite/SimpleGet/` - Navigate to your server's directory. Create a new `.sh` file `touch run_cob_spec_tests.sh` - Open the file and add the follwing: - `#!/bin/bash - set -e - cd cob_spec - mvn package - java -jar fitnesse.jar -c "PassingTests?suite&format=test" - ` + `#!/bin/bash` + + ` set -e` + + `cd cob_spec` + + `mvn package` + + `java -jar fitnesse.jar -c "PassingTests?suite&format=test"` + - The following CI instructions are for TravisCI but follow a similar pattern for other CI platforms. In .travis.yml: - `before_install: - - chmod +x run_cob_spec_tests.sh - script: - - "./run_cob_spec_tests.sh" - ` + `before_install:` + + ` - chmod +x run_cob_spec_tests.sh` + `script:` + + ` - "./run_cob_spec_tests.sh"` - Push branch and run the build From f4e1430cb78206db059d5594ce6db5107b3d3dc7 Mon Sep 17 00:00:00 2001 From: akiraandy Date: Fri, 13 Apr 2018 09:51:23 -0500 Subject: [PATCH 3/4] fix another space issue --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8980bd7..cea34df 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ Adding CI `before_install:` ` - chmod +x run_cob_spec_tests.sh` + `script:` ` - "./run_cob_spec_tests.sh"` From a74abdd3cd18a995f7b0c5088c95e5ee60c22459 Mon Sep 17 00:00:00 2001 From: akiraandy Date: Fri, 13 Apr 2018 09:52:33 -0500 Subject: [PATCH 4/4] formatting --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cea34df..05c0f5e 100644 --- a/README.md +++ b/README.md @@ -59,12 +59,13 @@ Adding CI - On your local machine navigate to your server's directory - Create a submodule using the forked copy of cob spec `git submodule add https://github.com/myusername/cob_spec` - Within this new submodule navigate to `FitNesseRoot` and create a new directory `mkdir PassingTests` -- Copy contents of `HttpTestSuite` into your new directory `PassingTests` by issuing the following command `cp -r HttpTestSuite/ PassingTests/` +- Copy contents of `HttpTestSuite` into your new directory `PassingTests` by issuing the following command: `cp -r HttpTestSuite/ PassingTests/` - Navigate into `PassingTests/ResponseTestSuite` and add/remove cob spec tests as necessary - To add a test to the `PassingTests`: `cp -r HttpTestSuite/ResponseTestSuite/SimpleGet PassingTests/ResponseTestSuite/SimpleGet/` - To remove a test in `PassingTests`: `rm -rf PassingTests/ResponseTestSuite/SimpleGet/` - Navigate to your server's directory. Create a new `.sh` file `touch run_cob_spec_tests.sh` -- Open the file and add the follwing: +- Open the file and add the following: + `#!/bin/bash` ` set -e`