Skip to content
This repository was archived by the owner on Jun 15, 2023. It is now read-only.

Commit 8e3918f

Browse files
author
Serhii Khoma
committed
Squashed commit of the following:
commit 3b7c111 Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 18:36:44 2020 +0200 fix: ci commit 1831afa Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 18:15:29 2020 +0200 fix: review -> commments and style commit f94fc1a Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 17:41:22 2020 +0200 fix: review -> return type Lunapark commit 95ba053 Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 17:36:30 2020 +0200 fix: review -> indentation commit e60fd79 Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 17:34:32 2020 +0200 fix: review -> rename LunaparkActionsEffect to ActionsEffect commit b3abe29 Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 17:11:39 2020 +0200 refactor: add comment commit e7428d9 Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 16:38:53 2020 +0200 fix: review -> fine grain tryAndCache errors commit 89c37e4 Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 12:12:16 2020 +0200 fix: review -> rename throwLeftJsonDecodeError to rethrowAsJsonDecodeError and remove throwLeftUserError commit 50f546e Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 12:06:00 2020 +0200 fix: review -> remove test commit 2c254f4 Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 12:05:31 2020 +0200 fix: review -> dont export handleAPIError commit 8ec2b5c Author: Serhii Khoma <[email protected]> Date: Thu Nov 19 11:47:25 2020 +0200 fix: review -> remove extra | commit 49e194e Author: Serhii Khoma <[email protected]> Date: Wed Nov 18 19:24:48 2020 +0200 feat: remove WithAction and WithLunapark, use rows commit 661bb41 Author: Serhii Khoma <[email protected]> Date: Wed Nov 18 19:04:42 2020 +0200 refactor: remove BaseRun and Lunapark, add LunaparkBaseEffects, LunaparkEffect, LunaparkActionsEffect commit c8dfbf1 Author: Serhii Khoma <[email protected]> Date: Wed Nov 18 13:27:30 2020 +0200 feat: rename post_ to post' to match post_ function from Affjax commit c29e049 Author: Serhii Khoma <[email protected]> Date: Tue Nov 17 15:01:20 2020 +0200 feat: update npm packages commit 69c22bb Author: Serhii Khoma <[email protected]> Date: Tue Nov 17 14:44:45 2020 +0200 feat: return bower commit 56eb0b4 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 20:36:00 2020 +0200 feat: printError commit a914049 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 20:34:41 2020 +0200 feat: printError commit 4a68045 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 19:14:14 2020 +0200 feat: travis -> use spago commit 8ef0769 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 19:09:15 2020 +0200 feat: remove bower commit 34d1fd8 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 19:09:07 2020 +0200 feat: add spago commit 42428e2 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 19:01:03 2020 +0200 feat: update bower commit 979439b Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 18:58:57 2020 +0200 feat: update to argonaut 7 and affjax 11 -> run ps-suggest -> fix prev run commit 5b58104 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 18:51:31 2020 +0200 feat: update to argonaut 7 and affjax 11 -> run ps-suggest commit 19df447 Author: Serhii Khoma <[email protected]> Date: Mon Nov 16 18:50:42 2020 +0200 feat: update to argonaut 7 and affjax 11
1 parent 0e29451 commit 8e3918f

File tree

14 files changed

+414
-350
lines changed

14 files changed

+414
-350
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ sudo: required
44
node_js: stable
55
install:
66
- npm install
7-
- npm install -g bower
8-
- bower install --production
7+
- npm install -g spago
8+
- spago install
99
script:
1010
- npm run -s build
1111
after_success:

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"vendor"
2626
],
2727
"dependencies": {
28-
"purescript-affjax": "^9.0.0",
29-
"purescript-argonaut-codecs": "^6.0.0",
28+
"purescript-affjax": "^11.0.0",
29+
"purescript-argonaut-codecs": "^7.0.0",
3030
"purescript-argonaut-core": "^5.0.0",
3131
"purescript-css": "^4.0.0",
3232
"purescript-node-fs-aff": "^6.0.0",

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"name": "purescript-lunapark",
33
"private": true,
44
"scripts": {
5-
"build": "pulp build -- --strict --stash",
6-
"build:non-strict": "pulp build",
5+
"build": "spago build --purs-args '--censor-lib --strict'",
6+
"build:non-strict": "spago build",
77
"ide": "purs ide server"
88
},
99
"license": "Apache-2.0",
1010
"dependencies": {
11-
"chromedriver": "^2.37.0",
12-
"pulp": "^12.2.0",
13-
"purescript": "^0.12.3",
14-
"purescript-psa": "^0.7.3",
15-
"xhr2": "^0.1.4"
11+
"chromedriver": "^86.0.0",
12+
"pulp": "^15.0.0",
13+
"purescript": "^0.13.8",
14+
"purescript-psa": "^0.8.0",
15+
"xhr2": "^0.2.0"
1616
}
1717
}

packages.dhall

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
let upstream =
2+
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201021/packages.dhall sha256:55ebdbda1bd6ede4d5307fbc1ef19988c80271b4225d833c8d6fb9b6fb1aa6d8
3+
4+
in upstream

spago.dhall

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{ name = "lunapark"
2+
, dependencies =
3+
[ "argonaut-core"
4+
, "argonaut-codecs"
5+
, "affjax"
6+
, "console"
7+
, "css"
8+
, "effect"
9+
, "node-fs-aff"
10+
, "psci-support"
11+
, "run"
12+
]
13+
, packages = ./packages.dhall
14+
, sources = [ "src/**/*.purs" ]
15+
}

src/Lunapark.purs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ module Lunapark
33
, module Lunapark.Error
44
, module Lunapark.ActionF
55
, module Lunapark.LunaparkF
6+
, module Lunapark.WebDriverError
67
) where
78

89

9-
import Lunapark.API (Interpreter(..), runInterpreter, BaseRun, HandleLunaparkInput, Lunapark, handleLunapark, init, interpret, interpretW3CActions, jsonWireActions, runLunapark, runLunaparkActions, w3cActions)
10-
import Lunapark.Error (Error, ErrorType(..), fromJson, fromStringCode, toStringCode, unknownError)
11-
import Lunapark.ActionF (ActionF(..), LUNAPARK_ACTIONS, TouchF(..), WithAction, _lunaparkActions, buttonDown, buttonUp, click, doubleClick, doubleTap, flick, liftAction, longTap, moveTo, pause, scroll, sendKeys, tap, touchDown, touchUp)
12-
import Lunapark.LunaparkF (ElementF(..), LUNAPARK, LunaparkF(..), WithLunapark, _lunapark, acceptAlert, addCookie, back, childElement, childElements, clearElement, clickElement, closeWindow, deleteAllCookies, deleteCookie, dismissAlert, elementScreenshot, executeScript, executeScriptAsync, findElement, findElements, forward, fullscreenWindow, getAlertText, getAllCookies, getAttribute, getCookie, getCss, getProperty, getRectangle, getTagName, getText, getTimeouts, getTitle, getUrl, getWindowHandle, getWindowHandles, getWindowRectangle, go, isDisplayed, isEnabled, isSelected, liftLunapark, maximizeWindow, minimizeWindow, performActions, quit, refresh, releaseActions, screenshot, sendAlertText, sendKeysElement, setTimeouts, setWindowRectangle, status, submitElement, switchToFrame, switchToParentFrame, switchToWindow)
10+
import Lunapark.API (Lunapark, Interpreter(..), runInterpreter, BaseEffects, HandleLunaparkInput, handleLunapark, init, interpret, interpretW3CActions, jsonWireActions, runLunapark, runLunaparkActions, w3cActions)
11+
import Lunapark.Error (Error(..), CachingError(..), printError)
12+
import Lunapark.ActionF (ActionF(..), LUNAPARK_ACTIONS, TouchF(..), ActionsEffect, _lunaparkActions, buttonDown, buttonUp, click, doubleClick, doubleTap, flick, liftAction, longTap, moveTo, pause, scroll, sendKeys, tap, touchDown, touchUp)
13+
import Lunapark.LunaparkF (ElementF(..), LUNAPARK, LunaparkF(..), LunaparkEffect, _lunapark, acceptAlert, addCookie, back, childElement, childElements, clearElement, clickElement, closeWindow, deleteAllCookies, deleteCookie, dismissAlert, elementScreenshot, executeScript, executeScriptAsync, findElement, findElements, forward, fullscreenWindow, getAlertText, getAllCookies, getAttribute, getCookie, getCss, getProperty, getRectangle, getTagName, getText, getTimeouts, getTitle, getUrl, getWindowHandle, getWindowHandles, getWindowRectangle, go, isDisplayed, isEnabled, isSelected, liftLunapark, maximizeWindow, minimizeWindow, performActions, quit, refresh, releaseActions, screenshot, sendAlertText, sendKeysElement, setTimeouts, setWindowRectangle, status, submitElement, switchToFrame, switchToParentFrame, switchToWindow)
14+
import Lunapark.WebDriverError (WebDriverError, WebDriverErrorType(..), fromJson, fromStringCode, toStringCode)

0 commit comments

Comments
 (0)