From 9eb468c9bc1cf1daaeaae5fa8875ba9e24806164 Mon Sep 17 00:00:00 2001 From: Andrea Briganti Date: Thu, 30 Aug 2018 15:59:14 +0200 Subject: [PATCH 1/2] ready to use project, example data moved to a dedicated directory Signed-off-by: Andrea Briganti --- .gitignore | 3 ++- .../features}/buy-workwear.feature | 0 .../features}/google-search.feature | 0 {img => examples/img}/cucumber-html-report.png | Bin {junit => examples/junit}/junit-report.xml | 0 .../page-objects}/google-search.js | 0 .../page-objects}/mammoth-workwear.js | 0 .../shared-objects}/test-data.js | 0 .../step-definitions}/buy-workwear-steps.js | 0 .../step-definitions}/google-search-steps.js | 0 {reports => features}/.gitkeep | 0 page-objects/.gitkeep | 0 shared-objects/.gitkeep | 0 step-definitions/.gitkeep | 0 14 files changed, 2 insertions(+), 1 deletion(-) rename {features => examples/features}/buy-workwear.feature (100%) mode change 100755 => 100644 rename {features => examples/features}/google-search.feature (100%) mode change 100755 => 100644 rename {img => examples/img}/cucumber-html-report.png (100%) mode change 100755 => 100644 rename {junit => examples/junit}/junit-report.xml (100%) rename {page-objects => examples/page-objects}/google-search.js (100%) mode change 100755 => 100644 rename {page-objects => examples/page-objects}/mammoth-workwear.js (100%) mode change 100755 => 100644 rename {shared-objects => examples/shared-objects}/test-data.js (100%) mode change 100755 => 100644 rename {step-definitions => examples/step-definitions}/buy-workwear-steps.js (100%) mode change 100755 => 100644 rename {step-definitions => examples/step-definitions}/google-search-steps.js (100%) mode change 100755 => 100644 rename {reports => features}/.gitkeep (100%) mode change 100755 => 100644 create mode 100644 page-objects/.gitkeep create mode 100644 shared-objects/.gitkeep create mode 100644 step-definitions/.gitkeep diff --git a/.gitignore b/.gitignore index 889dbe8..cfaf02a 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vscode node_modules package-lock.json -. idea/ \ No newline at end of file +.idea/ +*.iml diff --git a/features/buy-workwear.feature b/examples/features/buy-workwear.feature old mode 100755 new mode 100644 similarity index 100% rename from features/buy-workwear.feature rename to examples/features/buy-workwear.feature diff --git a/features/google-search.feature b/examples/features/google-search.feature old mode 100755 new mode 100644 similarity index 100% rename from features/google-search.feature rename to examples/features/google-search.feature diff --git a/img/cucumber-html-report.png b/examples/img/cucumber-html-report.png old mode 100755 new mode 100644 similarity index 100% rename from img/cucumber-html-report.png rename to examples/img/cucumber-html-report.png diff --git a/junit/junit-report.xml b/examples/junit/junit-report.xml similarity index 100% rename from junit/junit-report.xml rename to examples/junit/junit-report.xml diff --git a/page-objects/google-search.js b/examples/page-objects/google-search.js old mode 100755 new mode 100644 similarity index 100% rename from page-objects/google-search.js rename to examples/page-objects/google-search.js diff --git a/page-objects/mammoth-workwear.js b/examples/page-objects/mammoth-workwear.js old mode 100755 new mode 100644 similarity index 100% rename from page-objects/mammoth-workwear.js rename to examples/page-objects/mammoth-workwear.js diff --git a/shared-objects/test-data.js b/examples/shared-objects/test-data.js old mode 100755 new mode 100644 similarity index 100% rename from shared-objects/test-data.js rename to examples/shared-objects/test-data.js diff --git a/step-definitions/buy-workwear-steps.js b/examples/step-definitions/buy-workwear-steps.js old mode 100755 new mode 100644 similarity index 100% rename from step-definitions/buy-workwear-steps.js rename to examples/step-definitions/buy-workwear-steps.js diff --git a/step-definitions/google-search-steps.js b/examples/step-definitions/google-search-steps.js old mode 100755 new mode 100644 similarity index 100% rename from step-definitions/google-search-steps.js rename to examples/step-definitions/google-search-steps.js diff --git a/reports/.gitkeep b/features/.gitkeep old mode 100755 new mode 100644 similarity index 100% rename from reports/.gitkeep rename to features/.gitkeep diff --git a/page-objects/.gitkeep b/page-objects/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/shared-objects/.gitkeep b/shared-objects/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/step-definitions/.gitkeep b/step-definitions/.gitkeep new file mode 100644 index 0000000..e69de29 From 361b23585a1615a4f7bbdb68db7e7a529d685c8b Mon Sep 17 00:00:00 2001 From: Andrea Briganti Date: Fri, 31 Aug 2018 18:30:50 +0200 Subject: [PATCH 2/2] update shippable configuration Signed-off-by: Andrea Briganti --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 0872bfb..5c6ebe6 100755 --- a/shippable.yml +++ b/shippable.yml @@ -17,11 +17,11 @@ build: - sudo apt-get update # - sudo apt-get install curl # install chrome browser required for selenium tests - # - curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - + # - curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - # - echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list # - sudo apt-get update -qqy # - sudo apt-get -qqy install ${CHROME_VERSION:-google-chrome-stable} - # install ruby required to install cf cli + # install ruby required to install cf cli # - sudo apt-get --assume-yes install ruby # - sudo gem install bundler # - curl -O https://s3.amazonaws.com/go-cli/releases/v6.17.1/cf-cli-installer_6.17.1_x86-64.deb @@ -35,4 +35,4 @@ build: - export DISPLAY=:99.0 - mkdir -p shippable/buildoutput - shippable_retry npm install - - shippable_retry xvfb-run --server-args="-ac" node index.js -b firefox -t @search -x 30000 \ No newline at end of file + - shippable_retry xvfb-run --server-args="-ac" node index.js -p examples/page-objects/ -s examples/step-definitions/ -f examples/features/ -b firefox -t @search -x 30000