|
77 | 77 | :If 0=⎕NC'SETTINGS' ⋄ ApplySettings settings ⋄ :EndIf |
78 | 78 | :EndIf |
79 | 79 | browser←SETTINGS.BROWSER |
80 | | - files←browser SetUsing path←DLLPATH |
| 80 | + files←browser SetUsing (path←DLLPATH)SETTINGS.Newtonpath |
81 | 81 | 'CURRENTBROWSER'DefaultTo'' ⍝ Avoid VALUE ERRORs |
82 | 82 | ⎕EX'BROWSER'/⍨browser≢CURRENTBROWSER ⍝ We want to switch or need a new one |
83 | 83 | :Trap 0 ⍝ Try to find out if Browser is alive - not always reliable |
|
655 | 655 | :EndIf |
656 | 656 | ∇ |
657 | 657 |
|
658 | | - ∇ {files}←browser SetUsing path;net ⍝ Set the path to the Selenium DLLs |
| 658 | + ∇ {files}←browser SetUsing path;net ⍝ S)SETTINGS:Newtonpathet the path to the Selenium DLLs |
| 659 | + (path Newtonpath)←path |
659 | 660 | :If path≡'' ⋄ path←SourcePath ⎕THIS |
660 | 661 | :Else ⋄ path←path,(~'/\'∊⍨⊢/path)/'/' ⋄ :EndIf |
661 | 662 | ⎕USING←0⍴⎕USING |
|
671 | 672 | ⎕USING,←⊂'OpenQA.Selenium,',⊃files |
672 | 673 | ⎕USING,←⊂'OpenQA.Selenium.',browser,',',⊃files |
673 | 674 | ⎕USING,←⊂'OpenQA.Selenium.Support,',⊃⌽files |
674 | | - ⎕USING,←⊂'Newtonsoft.Json,',(1⊃1⎕nparts ¯1↓path),'more/newtonsoft_120r3-',net,'Newtonsoft.Json.dll' ⍝ one additional library required with .Net Core |
| 675 | + ⎕USING,←⊂'Newtonsoft.Json,',(1⊃1⎕nparts ¯1↓path),Newtonpath,net,'Newtonsoft.Json.dll' |
675 | 676 | ⍝ make sure we use the correct path-separator (⎕USING) |
676 | 677 | :If 'W'=1⊃1⊃'.'⎕WG'APLVersion' |
677 | 678 | ⎕USING←{'\'@('/'∘=)⍵}¨⎕USING |
|
768 | 769 | DEFAULTBROWSER←ref{6::2⊃⍵ ⋄ ⍺⍎1⊃⍵}'BROWSER'DEFAULTBROWSER |
769 | 770 | PORT←ref{6::2⊃⍵ ⋄ ⍺⍎1⊃⍵}'PORT'PORT |
770 | 771 | BROWSEROPTIONS←⍬ ⍝ no options found... |
| 772 | + NEWTONPATH←settings.Newtonpath |
771 | 773 | :Select ⍬⍴ref.⎕NC'Options' |
772 | 774 | :CaseList 2 9 ⋄ BROWSEROPTIONS←ref.Options |
773 | 775 | :EndSelect |
|
0 commit comments