Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ yarn-error.log
.phpunit.cache
app/cdash/tests/.phpunit.cache/
bootstrap/cache/*.php
cypress_cache
/.vitest/
public/images

Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ set(laravel_testing_dir "${CDash_SOURCE_DIR}/tests")
file(MAKE_DIRECTORY "/tmp/CDashTesting")

find_program(PHP_EXE NAMES php PATHS c:/xampp/php /xampp/php REQUIRED)
find_program(NPX_EXE NAMES npx PATHS c:/usr/bin/npx /usr/bin/npx REQUIRED)

set(PHPUNIT "${CDash_SOURCE_DIR}/vendor/bin/phpunit")

Expand Down
19 changes: 0 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,7 @@ RUN if [ "$DEVELOPMENT_BUILD" = '1' ]; then \
rsync \
libzip-dev `# needed for Laravel Dusk/Selenium` \
&& \
`# Cypress dependencies` \
apt-get install -y --no-install-recommends \
libgtk2.0-0 \
libgtk-3-0 \
libgbm-dev \
libnotify-dev \
libnss3 \
libxss1 \
libasound2 \
libxtst6 \
xauth \
xvfb \
&& \
rm -rf /var/lib/apt/lists/* && \
mkdir /tmp/.X11-unix && \
chmod 1777 /tmp/.X11-unix && \
chown root /tmp/.X11-unix/ && \
mkdir -p /var/www/.cache/mesa_shader_cache && \
pecl install xdebug && \
docker-php-ext-enable xdebug && \
docker-php-ext-install zip; \
Expand Down Expand Up @@ -253,8 +236,6 @@ LABEL MAINTAINER="Kitware, Inc. <cdash@public.kitware.com>"
ARG BASE_IMAGE
ARG DEVELOPMENT_BUILD

ENV CYPRESS_CACHE_FOLDER=/cdash/cypress_cache

# Set up testing environment if this is a development build
RUN if [ "$DEVELOPMENT_BUILD" = '1' ]; then \
mkdir _build && cd _build && \
Expand Down
18 changes: 9 additions & 9 deletions app/cdash/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,14 @@ add_browser_test(/Browser/Pages/ProjectSettingsPageTest)

add_browser_test(/Browser/Pages/BuildUpdatePageTest)

add_browser_test(/Browser/Pages/ManageBuildGroupPageTest)

add_browser_test(/Browser/Pages/ManageOverviewPageTest)

add_browser_test(/Browser/Pages/ManageSubProjectPageTest)

add_browser_test(/Browser/Pages/ViewSubProjectsPageTest)

add_php_test(image)
set_tests_properties(image PROPERTIES DEPENDS /CDash/XmlHandler/UpdateHandler)

Expand Down Expand Up @@ -773,16 +781,8 @@ add_laravel_test(/Feature/SubProjectDependencies)
set_tests_properties(/Feature/SubProjectDependencies PROPERTIES DEPENDS querytestsrevisionfilter)

# These tests should go last so the removal of builds doesn't clobber other tests
# TODO: Some of these dependencies may not be necessary.
add_php_test(deletesubproject)
set_property(TEST deletesubproject PROPERTY DEPENDS
cypress/e2e/manage-overview
cypress/e2e/manage-build-group
cypress/e2e/manage-sub-project
cypress/e2e/view-sub-projects
cypress/e2e/sub-project-group-order
cypress/e2e/sites
)
set_tests_properties(deletesubproject PROPERTIES DEPENDS timeline)

add_php_test(removebuilds)
set_tests_properties(removebuilds PROPERTIES DEPENDS deletesubproject)
Expand Down
22 changes: 0 additions & 22 deletions cypress.config.js

This file was deleted.

2 changes: 0 additions & 2 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ services:
build:
args:
DEVELOPMENT_BUILD: 1
environment:
CYPRESS_CACHE_FOLDER: /cdash/cypress_cache
volumes:
- ..:/cdash_src:ro
links:
Expand Down
7 changes: 0 additions & 7 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import js from '@eslint/js';
import globals from 'globals';
import pluginVue from 'eslint-plugin-vue';
import pluginCypress from 'eslint-plugin-cypress';
import stylistic from '@stylistic/eslint-plugin';
import { defineConfig, globalIgnores } from 'eslint/config';

Expand All @@ -12,7 +11,6 @@ export default defineConfig([
globalIgnores([
'vendor/*',
'_build/*',
'cypress_cache/*',
'public/assets/*',
'public/vendor/*',
'resources/js/angular/*',
Expand Down Expand Up @@ -149,10 +147,6 @@ export default defineConfig([
'vue/slot-name-casing': 'error',
},
},
{
files: ['**/cypress/**/*.js'],
...pluginCypress.configs.recommended,
},
{
files: [
'**/postcss.config.js',
Expand All @@ -168,7 +162,6 @@ export default defineConfig([
files: [
'**/webpack.mix.js',
'**/tailwind.config.js',
'**/cypress.config.js',
],
languageOptions: {
sourceType: 'commonjs',
Expand Down
Loading