Browse Source

Another build fix.

release/2.x v2.2.2
Sebastian 7 years ago
parent
commit
b80cd5d401
  1. 5
      src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
  2. 2
      src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  3. 4
      tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs

5
src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs

@ -8,6 +8,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Esprima;
using Jint; using Jint;
using Jint.Native; using Jint.Native;
using Jint.Native.Date; using Jint.Native.Date;
@ -121,6 +122,10 @@ namespace Squidex.Domain.Apps.Core.Scripting
{ {
throw new ValidationException($"Failed to execute script with javascript syntax error: {ex.Message}", new ValidationError(ex.Message)); throw new ValidationException($"Failed to execute script with javascript syntax error: {ex.Message}", new ValidationError(ex.Message));
} }
catch (ParserException ex)
{
throw new ValidationException($"Failed to execute script with javascript error: {ex.Message}", new ValidationError(ex.Message));
}
catch (JavaScriptException ex) catch (JavaScriptException ex)
{ {
throw new ValidationException($"Failed to execute script with javascript error: {ex.Message}", new ValidationError(ex.Message)); throw new ValidationException($"Failed to execute script with javascript error: {ex.Message}", new ValidationError(ex.Message));

2
src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@ -15,7 +15,7 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Jint" Version="3.0.0-beta-1469" /> <PackageReference Include="Jint" Version="3.0.0-beta-1580" />
<PackageReference Include="Microsoft.OData.Core" Version="7.5.4" /> <PackageReference Include="Microsoft.OData.Core" Version="7.5.4" />
<PackageReference Include="NJsonSchema" Version="9.14.1" /> <PackageReference Include="NJsonSchema" Version="9.14.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />

4
tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs

@ -36,7 +36,7 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting
[Fact] [Fact]
public void Should_catch_script_syntax_errors() public void Should_catch_script_syntax_errors()
{ {
Assert.Throws<ValidationException>(() => scriptEngine.Execute(new ScriptContext(), "x => x")); Assert.Throws<ValidationException>(() => scriptEngine.Execute(new ScriptContext(), "x ==> x"));
} }
[Fact] [Fact]
@ -68,7 +68,7 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting
var content = new NamedContentData(); var content = new NamedContentData();
var context = new ScriptContext { Data = content }; var context = new ScriptContext { Data = content };
Assert.Throws<ValidationException>(() => scriptEngine.ExecuteAndTransform(context, "x => x")); Assert.Throws<ValidationException>(() => scriptEngine.ExecuteAndTransform(context, "x ==> x"));
} }
[Fact] [Fact]

Loading…
Cancel
Save