Permalink
Browse files

[webui] the selenium test suite is now fully merged

  • Loading branch information...
1 parent 8f59337 commit 3ce67d41c5688693e5915fee9bb4374452938ebc @coolo coolo committed Dec 10, 2012
Showing with 138 additions and 4,080 deletions.
  1. +0 −2 .travis.yml
  2. +1 −6 dist/ci/obs_testsuite_all.sh
  3. +0 −6 dist/ci/obs_testsuite_coverage.sh
  4. +0 −17 dist/ci/obs_testsuite_travis.sh
  5. +1 −6 dist/ci/obs_testsuite_travis_before.sh
  6. +0 −73 dist/ci/obs_testsuite_webui-testsuite.sh
  7. +0 −3 src/webui-testsuite/.gitignore
  8. +0 −1 src/webui-testsuite/AUTHORS
  9. +0 −340 src/webui-testsuite/COPYING
  10. +0 −13 src/webui-testsuite/Gemfile
  11. +0 −39 src/webui-testsuite/Gemfile.lock
  12. +0 −12 src/webui-testsuite/README
  13. +0 −20 src/webui-testsuite/lib/AcceptanceTest.rb
  14. +0 −42 src/webui-testsuite/lib/OBSpages/AllProjectsPage.rb
  15. +0 −330 src/webui-testsuite/lib/OBSpages/BuildServicePage.rb
  16. +0 −46 src/webui-testsuite/lib/OBSpages/GroupIndexPage.rb
  17. +0 −46 src/webui-testsuite/lib/OBSpages/GroupShowPage.rb
  18. +0 −55 src/webui-testsuite/lib/OBSpages/InterconnectPage.rb
  19. +0 −72 src/webui-testsuite/lib/OBSpages/LoginPage.rb
  20. +0 −53 src/webui-testsuite/lib/OBSpages/MainPage.rb
  21. +0 −58 src/webui-testsuite/lib/OBSpages/MyProjectsPage.rb
  22. +0 −35 src/webui-testsuite/lib/OBSpages/MyRequestsPage.rb
  23. +0 −65 src/webui-testsuite/lib/OBSpages/MyWorkPage.rb
  24. +0 −80 src/webui-testsuite/lib/OBSpages/NewPackageBranchPage.rb
  25. +0 −80 src/webui-testsuite/lib/OBSpages/NewPackagePage.rb
  26. +0 −136 src/webui-testsuite/lib/OBSpages/NewProjectPage.rb
  27. +0 −63 src/webui-testsuite/lib/OBSpages/PackagePage.rb
  28. +0 −94 src/webui-testsuite/lib/OBSpages/PackagePages/PackageAddFilePage.rb
  29. +0 −86 src/webui-testsuite/lib/OBSpages/PackagePages/PackageEditFilePage.rb
  30. +0 −136 src/webui-testsuite/lib/OBSpages/PackagePages/PackageOverviewPage.rb
  31. +0 −34 src/webui-testsuite/lib/OBSpages/PackagePages/PackageRawConfigPage.rb
  32. +0 −34 src/webui-testsuite/lib/OBSpages/PackagePages/PackageRequestsPage.rb
  33. +0 −35 src/webui-testsuite/lib/OBSpages/PackagePages/PackageRevisionsPage.rb
  34. +0 −122 src/webui-testsuite/lib/OBSpages/ProjectPage.rb
  35. +0 −67 src/webui-testsuite/lib/OBSpages/ProjectPages/ProjectAddUserPage.rb
  36. +0 −33 src/webui-testsuite/lib/OBSpages/ProjectPages/ProjectConfigPage.rb
  37. +0 −160 src/webui-testsuite/lib/OBSpages/ProjectPages/ProjectOverviewPage.rb
  38. +0 −33 src/webui-testsuite/lib/OBSpages/ProjectPages/ProjectRawConfigPage.rb
  39. +0 −34 src/webui-testsuite/lib/OBSpages/ProjectPages/ProjectRequestsPage.rb
  40. +0 −32 src/webui-testsuite/lib/OBSpages/ProjectPages/ProjectStatusPage.rb
  41. +0 −33 src/webui-testsuite/lib/OBSpages/ProjectPages/ProjectSubprojectsPage.rb
  42. +0 −47 src/webui-testsuite/lib/OBSpages/RequestDetailsPage.rb
  43. +0 −56 src/webui-testsuite/lib/OBSpages/SearchResultsPage.rb
  44. +0 −35 src/webui-testsuite/lib/OBSpages/StatusMonitorPage.rb
  45. +0 −74 src/webui-testsuite/lib/OBSpages/UserHomePage.rb
  46. +0 −65 src/webui-testsuite/lib/common/Assertions.rb
  47. +0 −34 src/webui-testsuite/lib/common/ClassDeclarations.rb
  48. +0 −196 src/webui-testsuite/lib/common/HtmlReport.rb
  49. +0 −192 src/webui-testsuite/lib/common/TestCase.rb
  50. +0 −23 src/webui-testsuite/lib/common/TestData.rb
  51. +0 −152 src/webui-testsuite/lib/common/TestRunner.rb
  52. +0 −48 src/webui-testsuite/lib/common/WebDriver.rb
  53. +0 −126 src/webui-testsuite/lib/common/WebPage.rb
  54. +0 −296 src/webui-testsuite/run_acceptance_tests.rb
  55. +0 −67 src/webui-testsuite/tests/TC01__Login.rb
  56. +0 −35 src/webui-testsuite/tests/TC02__Home.rb
  57. +1 −1 src/webui/Gemfile
  58. +3 −0 src/webui/Gemfile.lock
  59. +106 −0 src/webui/test/functional/login_test.rb
  60. +26 −1 src/webui/test/functional/project_create_test.rb
View
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# This script runs WebUI selenium tests
-#
-
-###############################################################################
-# Job configuration template
-###############################################################################
-#
-# Project name: obs_testsuite_webui-testsuite
-# Description:
-# OBS WebUI selenium testsuite on git master branch.
-#
-# Updates source code repository and runs webui-testsuite.
-#
-# Source Code Management:
-# Git:
-# Repositories: git://github.com/openSUSE/open-build-service.git
-# Branches to build: master
-# Repository browser: githubweb
-# URL: https://github.com/openSUSE/open-build-service
-# Excluded Regions:
-# docs
-#
-# Build Triggers:
-# Poll SCM:
-# Schedule: */5 * * * *
-#
-# Build:
-# Execute shell:
-# Command: sh dist/ci/obs_testsuite_webui-testsuite.sh
-#
-# Post Build Actions: #FIXME
-# Publish JUnit test result report:
-# Test report XMLs: src/webui/results/*.xml
-# Publish Rails Notes report: 1
-# Rake working directory: src/webui
-# Publish Rails stats report: 1
-# Rake working directory: src/webui
-#
-
-###############################################################################
-# Script content for 'Build' step
-###############################################################################
-#
-# Either invoke as described above or copy into an 'Execute shell' 'Command'.
-#
-
-set -xe
-. `dirname $0`/obs_testsuite_common.sh
-
-setup_git
-setup_api
-setup_webui
-
-echo "Running Acceptance Tests"
-cd src/webui-testsuite
-export OBS_REPORT_DIR=results/
-bundle exec ruby ./run_acceptance_tests.rb || ret=1
-
-cd ../..
-
-echo "Contents of src/api/log/test.log:"
-cat src/api/log/test.log
-echo
-
-echo "Contents of src/webui/log/test.log:"
-cat src/webui/log/test.log
-echo
-
-cleanup
-exit $ret
-
@@ -1,3 +0,0 @@
-*.c
-*.cc
-results*
@@ -1 +0,0 @@
-Stoyan Dimkov <stoyan.dimkov@gmail.com>
Oops, something went wrong.

0 comments on commit 3ce67d4

Please sign in to comment.