Skip to content

Commit e4c3e33

Browse files
committed
Upgrade Cypress
1 parent 88e00f0 commit e4c3e33

File tree

9 files changed

+4729
-3500
lines changed

9 files changed

+4729
-3500
lines changed

build.cake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#tool nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.8.0
22

33
#addin nuget:?package=Cake.Sonar&version=1.1.30
4-
#addin nuget:?package=Cake.Yarn&version=0.4.8
4+
#addin nuget:?package=Cake.Npx&version=1.7.0
55
#addin nuget:?package=Cake.Docker&version=1.1.2
66

77
var target = Argument("target", "Default");
8-
var cypressConfigurationFile = Argument("cypressConfigurationFile", "cypress.json");
8+
var cypressConfigurationFile = Argument("cypressConfigurationFile", "cypress.config.js");
99
var cypressEnableRecording = Argument("cypressEnableRecording", false);
1010

1111
var buildConfiguration = "Release";
@@ -153,7 +153,7 @@ Task("RunEndToEndTests")
153153
{
154154
cypressCommand += " --record";
155155
}
156-
Yarn.RunScript(cypressCommand);
156+
Npx(cypressCommand);
157157
Context.Environment.WorkingDirectory = currentWorkingDirectory;
158158
});
159159

src/CurlToCSharp/CurlToCSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<Target Name="CustomActionsBeforePublish" BeforeTargets="BeforePublish">
13-
<Exec Command="yarn" />
13+
<Exec Command="npm install" />
1414
<Exec Command="gulp" />
1515
</Target>
1616

src/CurlToCSharp/cypress.config.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const { defineConfig } = require('cypress')
2+
3+
module.exports = defineConfig({
4+
projectId: 'ndyf19',
5+
e2e: {
6+
// We've imported your old cypress plugins here.
7+
// You may want to clean this up later by importing these.
8+
setupNodeEvents(on, config) {
9+
return require('./cypress/plugins/index.js')(on, config)
10+
},
11+
baseUrl: 'http://localhost:8080',
12+
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
13+
},
14+
})

src/CurlToCSharp/cypress.json

Lines changed: 0 additions & 4 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)