Skip to content

Commit fdb3da6

Browse files
asbjornuasbjornu
authored
Merge pull request #37 from AlexanderStromer/main
Update to HtmlUnit 2.50
2 parents 0f427ae + 596c140 commit fdb3da6

1,270 files changed

Lines changed: 16882 additions & 12052 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/unittests.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Unit Tests
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
test:
11+
12+
runs-on: windows-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
17+
- name: Setup MSBuild
18+
uses: microsoft/setup-msbuild@v1
19+
20+
- name: Setup NuGet.exe
21+
uses: NuGet/setup-nuget@v1.0.5
22+
23+
- name: Restore NuGet packages
24+
run: nuget restore NHtmlUnit.sln
25+
26+
- name: Build Solution
27+
run: msbuild NHtmlUnit.sln
28+
29+
- name: Test Solution
30+
run: packages\NUnit.ConsoleRunner.3.12.0\tools\nunit3-console.exe tests\IntegrationTests\bin\x64\Debug\IntegrationTests.dll

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*.dotCover
99
*.nupkg
1010
.DS_Store
11+
/.vs
1112
/_ReSharper.NHtmlUnit/
1213
/packages/*
1314
!/packages/repositories.config

‎NHtmlUnit.nuspec‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<metadata>
4+
<id>NHtmlUnit</id>
5+
<version>2.50.0.0</version>
6+
<title>NHtmlUnit</title>
7+
<authors>OKB AS</authors>
8+
<owners>OKB AS</owners>
9+
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
10+
<projectUrl>https://github.com/HtmlUnit/NHtmlUnit</projectUrl>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>NHtmlUnit is a .NET wrapper of HtmlUnit; a "GUI-less browser for Java programs". It allows you to write code to test web applications with a headless, automated browser.</description>
13+
<releaseNotes>Updated to version 7.4.5196 of IKVM.</releaseNotes>
14+
<copyright>Copyright © OKB AS 2021</copyright>
15+
<tags>testing htmlunit nhtmlunit headless browser</tags>
16+
<dependencies>
17+
<dependency id="IKVM" version="7.4.5196.0" />
18+
</dependencies>
19+
<frameworkAssemblies />
20+
<references />
21+
</metadata>
22+
<files>
23+
<file src="app\NHtmlUnit\bin\Release\HtmlUnit.dll" target="lib/net45" />
24+
<file src="app\NHtmlUnit\bin\Release\NHtmlUnit.dll" target="lib/net45" />
25+
</files>
26+
</package>

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
| | **Status** |
44
| ---------------------: | :------------------------ |
55
| **GitHub** | [![GitHub release][1]][2] |
6+
| **GitHub Actions** | [![Unit Tests][11]][12] |
67
| **NuGet** | [![NuGet][3]][4] |
78
| **Travis** (Linux) | [![Master][5]][6] |
89
| **AppVeyor** (Windows) | [![Master][7]][8] |
@@ -94,8 +95,10 @@ NHtmlUnit was written by @asbjornu and @beewarloc.
9495
[6]: https://travis-ci.org/HtmlUnit/NHtmlUnit
9596
[7]: https://img.shields.io/appveyor/ci/HtmlUnit/NHtmlUnit/master.svg
9697
[8]: https://ci.appveyor.com/project/HtmlUnit/NHtmlUnit/branch/master
97-
[9]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit/badge/master
98-
[10]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit/overview/master
98+
[9]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit/badge
99+
[10]: https://www.codefactor.io/repository/github/htmlunit/nhtmlunit
100+
[11]: https://github.com/HtmlUnit/NHtmlUnit/actions/workflows/unittests.yml/badge.svg
101+
[12]: https://github.com/HtmlUnit/NHtmlUnit/actions/workflows/unittests.yml
99102
[htmlunit]: http://htmlunit.sourceforge.net/
100103
[ikvm]: http://www.ikvm.net/
101104
[nuget]: https://nuget.org/packages/NHtmlUnit

‎app/GlobalAssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
// --------------------------------------------------
4-
// Copyright © 2003-2016 OKB. All Rights Reserved.
4+
// Copyright © 2003-2021 OKB. All Rights Reserved.
55
//
66
// This software is proprietary information of OKB.
77
// USE IS SUBJECT TO LICENSE TERMS.
@@ -14,6 +14,6 @@
1414

1515
[assembly : AssemblyCompany("OKB AS")]
1616
[assembly : AssemblyProduct("NHtmlUnit")]
17-
[assembly : AssemblyCopyright("Copyright © OKB AS 2016")]
18-
[assembly : AssemblyTrademark("OKB AS 2016")]
17+
[assembly : AssemblyCopyright("Copyright © OKB AS 2021")]
18+
[assembly : AssemblyTrademark("OKB AS 2021")]
1919
[assembly : ComVisible(false)]

‎app/NHtmlUnit/Generated/Activex/Javascript/Msxml/MSXMLActiveXObjectFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated class v2.19.0.0, don't modify
1+
// Generated class v2.50.0.0, don't modify
22

33
using System;
44
using System.Collections.Generic;

‎app/NHtmlUnit/Generated/Activex/Javascript/Msxml/MSXMLConfiguration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated class v2.19.0.0, don't modify
1+
// Generated class v2.50.0.0, don't modify
22

33
using System;
44
using System.Collections.Generic;

‎app/NHtmlUnit/Generated/Activex/Javascript/Msxml/MSXMLJavaScriptEnvironment.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated class v2.19.0.0, don't modify
1+
// Generated class v2.50.0.0, don't modify
22

33
using System;
44
using System.Collections.Generic;

‎app/NHtmlUnit/Generated/Activex/Javascript/Msxml/MSXMLScriptable.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated class v2.19.0.0, don't modify
1+
// Generated class v2.50.0.0, don't modify
22

33
using System;
44
using System.Collections.Generic;

‎app/NHtmlUnit/Generated/Activex/Javascript/Msxml/XMLDOMAttribute.cs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated class v2.19.0.0, don't modify
1+
// Generated class v2.50.0.0, don't modify
22

33
using System;
44
using System.Collections.Generic;
@@ -47,14 +47,12 @@ public System.String Name
4747
return WObj.getName();
4848
}
4949
}
50-
51-
public System.Boolean Specified
52-
{
53-
get
54-
{
55-
return WObj.getSpecified();
56-
}
57-
}
50+
// Generating method code for isSpecified
51+
public virtual bool IsSpecified()
52+
{
53+
return WObj.isSpecified();
54+
}
55+
5856
// Generating method code for detachFromParent
5957
public virtual void DetachFromParent()
6058
{

0 commit comments

Comments
 (0)