Skip to content
Merged
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
2 changes: 1 addition & 1 deletion cypress/e2e/files/files-copy-move.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('Files: Move or copy files', { testIsolation: true }, () => {
getRowForFile('original folder').should('not.exist')
})

it.only('Can move a file to its parent folder', () => {
it('Can move a file to its parent folder', () => {
cy.mkdir(currentUser, '/new-folder')
cy.uploadContent(currentUser, new Blob(), 'text/plain', '/new-folder/original.txt')
cy.login(currentUser)
Expand Down
25 changes: 21 additions & 4 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import { includeIgnoreFile } from '@eslint/compat'
import { recommendedVue2 } from '@nextcloud/eslint-config'
import CypressEslint from 'eslint-plugin-cypress'
import noOnlyTests from 'eslint-plugin-no-only-tests'
import { defineConfig } from 'eslint/config'
import * as globals from 'globals'
import { fileURLToPath } from 'node:url'
Expand All @@ -22,9 +23,7 @@ export default defineConfig([

...recommendedVue2,

// respect .gitignore
includeIgnoreFile(gitignorePath, 'Imported .gitignore patterns'),

// add globals configuration for Webpack injected variables
{
name: 'server/custom-webpack-globals',
files: ['**/*.js', '**/*.ts', '**/*.vue'],
Expand All @@ -35,6 +34,7 @@ export default defineConfig([
},
},

// Ensure that cjs files are treated as Node scripts
{
name: 'server/scripts-are-cjs',
files: [
Expand All @@ -55,6 +55,7 @@ export default defineConfig([
'jsdoc/require-jsdoc': 'off',
},
},

// Cypress setup
{
...CypressEslint.configs.recommended,
Expand All @@ -72,7 +73,23 @@ export default defineConfig([
'@typescript-eslint/no-unused-expressions': 'off',
},
},
// customer server ignore files

// Forbid commiting .only in test files (skipping tests is very unexpected)
{
name: 'server/no-only-in-tests',
files: ['cypress/**', 'apps/**/*.spec.*', 'core/**/*.spec.*'],
plugins: {
'no-only-tests': noOnlyTests,
},
rules: {
'no-only-tests/no-only-tests': 'error',
},
},

// respect .gitignore
includeIgnoreFile(gitignorePath, 'Imported .gitignore patterns'),

// custom server ignore files
{
name: 'server/ignored-files',
ignores: [
Expand Down
11 changes: 11 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
"dockerode": "^4.0.9",
"eslint": "^9.36.0",
"eslint-plugin-cypress": "^5.1.1",
"eslint-plugin-no-only-tests": "^3.3.0",
"exports-loader": "^5.0.0",
"file-loader": "^6.2.0",
"handlebars-loader": "^1.7.3",
Expand Down
Loading