Added support for fileupload in DotVVM 3.1 apps

Author: quigamdev

README.md

@@ -6,19 +6,18 @@ Framework is based on selenium wrappers and principles which canopy uses.
 
 # APIs
 
-We created types of 3 APIs. 
+We created types of 2 APIs. 
  - AssertAPI
- - FluentAPI
- - LambdaAPI - *just concept - not implemented*
+ - FluentAPI - discontinued due to lack of interest.
 
  ## Assert API
- Assert API uses concept of one assertion on one line. This approach has its own advantages when you need to quickly navigate between stack trace and source code. 
+ Assert API uses concept of one assertation on one line. This approach has big  advantage when you need to quickly navigate between stack trace and source code. 
 
  ```
  AssertUI.InnerTextEquals(element, "expected value", "Custom error message.");
  ``` 
 
-## Fluent API
+## Fluent API (discontinued)
 Fluent API is perfect for really simple tests. You can stack more checking methods in a row. 
 
 ```

src/Integrations/Riganti.Selenium.DotVVM.MSTest2/DotVVMAssert.cs

@@ -16,24 +16,50 @@ public static void UploadFile(IElementWrapper element, string fullFileName)
             if (element.BrowserWrapper.IsDotvvmPage())
             {
                 element.BrowserWrapper.LogVerbose("Selenium.DotVVM : Uploading file");
-                var name = element.GetTagName();
-                if (name == "a" && element.HasAttribute("onclick") && (element.GetAttribute("onclick")?.Contains("showUploadDialog") ?? false))
-                {
-                    UploadFileByA(element, fullFileName);
-                    return;
-                }
+                var isLessThenDotvvm30 = element.BrowserWrapper.GetJavaScriptExecutor()
+                 .ExecuteScript("return !!(window[\"dotvvm\"] && dotvvm && dotvvm.fileUpload && dotvvm.fileUpload.createUploadId )|| false") as bool? ?? false;
 
-                if (name == "div" && element.FindElements("iframe", SelectBy.CssSelector).Count == 1)
+                if (isLessThenDotvvm30)
                 {
-                    UploadFileByDiv(element, fullFileName);
-                    return;
+                    element.BrowserWrapper.LogVerbose("Selenium.DotVVM : Uploading file");
+                    var name = element.GetTagName();
+                    if (name == "a" && element.HasAttribute("onclick") && (element.GetAttribute("onclick")?.Contains("showUploadDialog") ?? false))
+                    {
+                        UploadFileByA(element, fullFileName);
+                        return;
+                    }
+
+                    if (name == "div" && element.FindElements("iframe", SelectBy.CssSelector).Count == 1)
+                    {
+                        UploadFileByDiv(element, fullFileName);
+                        return;
+                    }
+                    else
+                    {
+                        element.BrowserWrapper.LogVerbose("Selenium.DotVVM : Cannot identify DotVVM scenario. Uploading over standard procedure.");
+
+                        element.BrowserWrapper.OpenInputFileDialog(element, fullFileName);
+                        return;
+                    }
                 }
                 else
                 {
-                    element.BrowserWrapper.LogVerbose("Selenium.DotVVM : Cannot identify DotVVM scenario. Uploading over standard procedure.");
+                    var name = element.GetTagName();
+                    if (name == "a" && element.HasAttribute("onclick") && (element.GetAttribute("onclick")?.Contains("showUploadDialog") ?? false))
+                    {
+                        element = element.ParentElement.ParentElement;
+                    }
 
-                    element.BrowserWrapper.OpenInputFileDialog(element, fullFileName);
-                    return;
+                    if (element.GetTagName() == "div")
+                    {
+                        var fileInput = element.Single("input[type=file]");
+                        fileInput.SendKeys(fullFileName);
+
+                        element.Wait(element.ActionWaitTime);
+                        return;
+                    }
+
+                    element.BrowserWrapper.LogVerbose("Selenium.DotVVM : Cannot identify DotVVM scenario. Uploading over standard procedure.");
                 }
             }
 
@@ -54,7 +80,7 @@ private static void UploadFileByDiv(IElementWrapper element, string fullFileName
 
             element.Wait(element.ActionWaitTime);
             element.ActivateScope();
-            
+
         }
 
         private static void UploadFileByA(IElementWrapper element, string fullFileName)

src/Riganti.Selenium.DotVVM3Samples/Riganti.Selenium.DotVVM3.Samples.csproj

@@ -4,12 +4,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Content Include="**/*.dothtml;**/*.dotmaster;**/*.dotcontrol" Exclude="obj/**/*.*;bin/**/*.*" CopyToPublishDirectory="Always" />
+    <Compile Remove="temp\**" />
+    <Content Remove="temp\**" />
+    <EmbeddedResource Remove="temp\**" />
     <None Remove="**/*.dothtml;**/*.dotmaster;**/*.dotcontrol" />
+    <None Remove="temp\**" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="dotvvm_serialized_config.json.tmp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DotVVM.AspNetCore" Version="3.0.0" />
+    <PackageReference Include="DotVVM.AspNetCore" Version="3.0.3" />
   </ItemGroup>
 </Project>

src/Riganti.Selenium.DotVVM3Samples/ViewModels/FileUploadViewModel.cs

@@ -0,0 +1,10 @@
+using DotVVM.Framework.Controls;
+using DotVVM.Framework.ViewModel;
+
+namespace Riganti.Selenium.DotVVM3.Samples.ViewModels
+{
+    public class FileUploadViewModel : DotvvmViewModelBase
+    {
+        public UploadedFilesCollection Files { get; set; } = new UploadedFilesCollection();
+    }
+}

src/Riganti.Selenium.DotVVM3Samples/Views/FileUpload.dothtml

@@ -0,0 +1,12 @@
+@viewModel Riganti.Selenium.DotVVM3.Samples.ViewModels.FileUploadViewModel, Riganti.Selenium.DotVVM3.Samples
+<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <dot:FileUpload ID="FUpload" UploadedFiles="{value: Files}" UploadButtonText="text" />
+</body>
+</html>

src/Tests/Riganti.Selenium.Core.Samples.Tests/UrlTests.cs

@@ -11,6 +11,7 @@ namespace Riganti.Selenium.Core.Samples.FluentApi.Tests
     [TestClass]
     public class UrlTests : SeleniumTest
     {
+        [TestMethod]
         public void Url_CheckHyperLink_Relative()
         {
             this.RunInAllBrowsers(browser =>
@@ -26,7 +27,8 @@ public void Url_CheckHyperLink_Relative()
                 browser.CheckIfHyperLinkEquals("#RelativeLink", "path/test?query=test#fragmentasd", UrlKind.Relative,
                     UriComponents.PathAndQuery);
                 browser.CheckIfHyperLinkEquals("#RelativeLink", "path/test?query=test#fragment", UrlKind.Relative,
-                    UriComponents.PathAndQuery);
+                    UriComponents.PathAndQuery); 
+                browser.CheckIfHyperLinkEquals("#RelativeLink", "path/test", UrlKind.Relative,UriComponents.Path);
             });
         }
 

src/Tests/Riganti.Selenium.DotVVM3.Samples.Tests/FileUploadTests.cs

@@ -0,0 +1,58 @@
+using Riganti.Selenium.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Riganti.Selenium.DotVVM;
+using System.IO;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Riganti.Selenium.DotVVM3.Samples.Tests
+{
+    public class FileUploadTests : AppSeleniumTest
+    {
+        public FileUploadTests(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        public void FileUpload_ElementWrapperByDiv()
+        {
+            RunInAllBrowsers(browser =>
+            {
+                browser.NavigateToUrl("/FileUpload");
+
+                var tempPath = Path.GetTempFileName();
+                File.WriteAllBytes(tempPath, Enumerable.Range(0, 255).Select(i => (byte)i).ToArray());
+
+                var elm = browser.First("#FUpload", SelectBy.CssSelector);
+                DotVVMAssert.UploadFile(browser.First("#FUpload"), tempPath);
+
+                browser.WaitFor(() =>
+                {
+                    AssertUI.InnerTextEquals(browser.First("#FUpload .dotvvm-upload-files"), "1 files", false);
+                }, 4000, "File upload failed.");
+            });
+        }
+        [Fact]
+        public void FileUpload_ElementWrapperByA()
+        {
+            RunInAllBrowsers(browser =>
+            {
+                browser.NavigateToUrl("/FileUpload");
+
+                var tempPath = Path.GetTempFileName();
+                File.WriteAllBytes(tempPath, Enumerable.Range(0, 255).Select(i => (byte)i).ToArray());
+
+                DotVVMAssert.UploadFile(browser.First(".dotvvm-upload-button a"), tempPath);
+
+                browser.WaitFor(() =>
+                {
+                    AssertUI.InnerTextEquals(browser.First("#FUpload .dotvvm-upload-files"), "1 files", false);
+                }, 4000, "File upload failed.");
+            });
+        }
+    }
+}