From d10b93cd288b0763be889672cd0f64254a3bf967 Mon Sep 17 00:00:00 2001 From: JR Boyens Date: Fri, 26 Jul 2013 12:28:11 -0700 Subject: [PATCH] Add node specs to the Travis build --- .travis.yml | 8 ++++++-- travis-chromium-script.sh | 8 -------- travis-core-script.sh | 5 +++++ travis-node-script.sh | 6 ++++++ 4 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 travis-chromium-script.sh create mode 100644 travis-core-script.sh create mode 100644 travis-node-script.sh diff --git a/.travis.yml b/.travis.yml index fdfe24fc..bca24375 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,18 +3,22 @@ before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start before_script: -- curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash -script: DISPLAY=:99.0 bundle exec rake core_spec +- test $USE_SAUCE == "true" && curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash +script: $TEST_COMMAND language: ruby rvm: 1.9.3 env: global: - USE_SAUCE=true - NOKOGIRI_USE_SYSTEM_LIBRARIES=true + - TEST_COMMAND="bash travis-core-script.sh" - secure: WSPWhlnC4mWSnSPquX+m1/BCu5ch5NygkaHuM2Nea7lD8oS3XLX8QncZZAsQ4lnNfqoDDuBOizG0AESiqNvE4y6x5qvLLTS6q+ce255ZEMZ71TBdZgDEEvGMEjOPPsVXiXyTQOP1lwOPlrbZvaPgWV7e11KIBab6DfFcQpnvDgo= - secure: SW7CJhZnwaNT749Gdnhvqb5rbXlAOsygUAzh9qhtyvbqXKkmJdBIEsO01YF6pbju1X2twE9JvWCOxeZju43NgQChJlPsGbjY2j3k/TdQeTAJesQe2K7ytwghunI30gjEovtRH0T3w1EmcKPH8yj5eBIcB2OYoJHx8KEC7e68q1g= matrix: include: + - env: + - USE_SAUCE=false + - TEST_COMMAND="bash travis-node-script.sh" - env: - JASMINE_BROWSER="firefox" - SAUCE_PLATFORM="Linux" diff --git a/travis-chromium-script.sh b/travis-chromium-script.sh deleted file mode 100644 index 471c46f4..00000000 --- a/travis-chromium-script.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -sudo apt-get update -sudo apt-get install chromium-browser -wget https://chromedriver.googlecode.com/files/chromedriver_linux64_2.1.zip -unzip chromedriver_linux64_2.1.zip -sudo mv chromedriver /usr/local/bin/ -sudo chmod +x /usr/local/bin/chromedriver \ No newline at end of file diff --git a/travis-core-script.sh b/travis-core-script.sh new file mode 100644 index 00000000..0994a27b --- /dev/null +++ b/travis-core-script.sh @@ -0,0 +1,5 @@ +#!/bin/bash -e + +export DISPLAY=:99.0 + +bundle exec rake core_spec diff --git a/travis-node-script.sh b/travis-node-script.sh new file mode 100644 index 00000000..53275021 --- /dev/null +++ b/travis-node-script.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +npm install -g grunt-cli +npm install + +grunt execSpecsInNode