[webui] the selenium test suite is now fully merged

.travis.yml

@@ -12,8 +12,6 @@ env:
   # full webrat test suite
   - SUBTEST=webui1
   - SUBTEST=webui2
-  # selenium without spider
-  - SUBTEST=webui-testsuite
   # api and webui webrat with latest gems
 #  - SUBTEST=api REMOVEGEMLOCK=true
 #  - SUBTEST=webui REMOVEGEMLOCK=true

dist/ci/obs_testsuite_all.sh

@@ -57,13 +57,8 @@ cd src/webui
 bundle exec rake ci:setup:minitest test CI_REPORTS=results --trace || ret=1
 cd ../..
 
-cd src/webui-testsuite
-export OBS_REPORT_DIR=results/
-bundle exec ruby ./run_acceptance_tests.rb || ret=1
-cd ../..
-
 mkdir results
-for i in src/api/results/*.xml src/webui/results/*.xml src/webui-testsuite/results/*.xml; do
+for i in src/api/results/*.xml src/webui/results/*.xml; do
  cp -v $i results/`echo $i | sed -e 's,/,-,g'`
 done
 

dist/ci/obs_testsuite_coverage.sh

@@ -72,10 +72,4 @@ mkdir -p coverage
 rake test --trace || true
 cd ../..
 
-cd src/webui-testsuite
-# FIXME there is no point in running this at the moment because we need to add means of starting
-# webui and api server under code coverage (easy part) _and_ have jenkins merge the results
-ruby ./run_acceptance_tests.rb || true
-cd ../..
-
 cleanup

dist/ci/obs_testsuite_travis.sh

@@ -34,23 +34,6 @@ case $SUBTEST in
    fi
    bundle exec rake test --trace || ret=1
    ;;
-  webui-testsuite)
-   cd src/webui-testsuite
-   if ! bundle exec ./run_acceptance_tests.rb -f; then
-     ret=1
-     tail -n 500 ../webui/log/test.log
-     cat results/*.source.html
-   fi
-   ;;
-  webui-testsuite:*)
-   cd src/webui-testsuite
-   SUBTEST=${SUBTEST/webui-testsuite:/}
-   if ! bundle exec ruby ./run_acceptance_tests.rb -f $SUBTEST; then
-     ret=1
-     tail -n 500 ../webui/log/test.log
-     cat results/*.source.html
-   fi
-   ;;
   webui:*)
    echo "Enter WebUI rails root"
    cd src/webui

dist/ci/obs_testsuite_travis_before.sh

@@ -41,12 +41,7 @@ case "$SUBTEST" in
  webui*)
   sudo apt-cache show firefox 
   sudo apt-get install --force-yes firefox=11.0+build1-0ubuntu4
-  pushd src/webui-testsuite
-  if test "$REMOVEGEMLOCK" = true; then
-    rm Gemfile.lock
-  fi
-  bundle install
-  cd ../webui
+  pushd src/webui
   if test "$REMOVEGEMLOCK" = true; then
     rm Gemfile.lock
   fi