jamesread 2 лет назад
Родитель
Сommit
7dbc077f76

+ 3 - 3
integration-tests/Vagrantfile

@@ -13,19 +13,19 @@ Vagrant.configure("2") do |config|
 
   config.vm.define :f36 do |f36|
     f36.vm.box = "generic/fedora36"
-    f36.vm.provision "file", source: "/opt/OliveTin-vagrant/linux_amd64_rpm/.", destination: "."
+    f36.vm.provision "file", source: "/opt/OliveTin-snapshot/OliveTin_linux_amd64.rpm", destination: "$HOME/"
     f36.vm.provision "shell", inline: "rpm -U OliveTin* && systemctl enable --now OliveTin && systemctl disable --now firewalld"
   end
 
   config.vm.define :debian do |debian|
     debian.vm.box = "generic/debian10"
-    debian.vm.provision "file", source: "/opt/OliveTin-vagrant/linux_amd64_deb/.", destination: "."
+    debian.vm.provision "file", source: "/opt/OliveTin-snapshot/OliveTin_linux_amd64.deb", destination: "$HOME/"
     debian.vm.provision "shell", inline: "dpkg --force-confold -i OliveTin* && systemctl enable --now OliveTin"
   end
 
   config.vm.define :ubuntu do |ubuntu|
     ubuntu.vm.box = "generic/ubuntu2110"
-    ubuntu.vm.provision "file", source: "/opt/OliveTin-vagrant/linux_amd64_deb/.", destination: "."
+    ubuntu.vm.provision "file", source: "/opt/OliveTin-snapshot/OliveTin_linux_amd64.deb", destination: "$HOME/"
     ubuntu.vm.provision "shell", inline: "dpkg --force-confold -i OliveTin* && systemctl enable --now OliveTin && systemctl disable --now firewalld"
   end
 

+ 14 - 0
integration-tests/cypress.config.js

@@ -0,0 +1,14 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  screenshotsFolder: 'results/screenshots/',
+  videosFolder: 'results/videos/',
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:1337',
+  },
+})

+ 0 - 5
integration-tests/cypress.json

@@ -1,5 +0,0 @@
-{
-	"baseUrl": "http://localhost:1337",
-	"screenshotsFolder": "results/screenshots/",
-	"videosFolder": "results/videos/"
-}

+ 0 - 0
integration-tests/cypress/integration/general/defaultHomepageRender.spec.js → integration-tests/cypress/e2e/general/defaultHomepageRender.cy.js


+ 0 - 0
integration-tests/cypress/integration/hiddenFooter/hiddenFooter.spec.js → integration-tests/cypress/e2e/hiddenFooter/hiddenFooter.cy.js


+ 0 - 0
integration-tests/cypress/integration/hiddenNav/hiddenNav.spec.js → integration-tests/cypress/e2e/hiddenNav/hiddenNav.cy.js


+ 0 - 0
integration-tests/cypress/support/index.js → integration-tests/cypress/support/e2e.js


+ 1 - 1
integration-tests/cypressRunVagrant.sh

@@ -9,4 +9,4 @@ BASE_URL="http://$IP:1337/"
 echo "IP: $IP, BaseURL: $BASE_URL"
 
 # Only run the general test, as we cannot easily switch out configs in VMs yet.
-./node_modules/.bin/cypress run --headless -c baseUrl=$BASE_URL -s cypress/integration/general/*
+./node_modules/.bin/cypress run --headless -c baseUrl=$BASE_URL -s cypress/e2e/general/*

Разница между файлами не показана из-за своего большого размера
+ 339 - 112
integration-tests/package-lock.json


+ 2 - 2
integration-tests/package.json

@@ -9,7 +9,7 @@
   },
   "author": "",
   "license": "ISC",
-  "dependencies": {
-    "cypress": "^8.3.0"
+  "devDependencies": {
+    "cypress": "^12.17.4"
   }
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов