Skip to content

Commit 23704ed

Browse files
author
Markus Stahl
committed
Merge branch 'master' into dependabot/npm_and_yarn/minimist-1.2.8
2 parents bd45e54 + bd9aba8 commit 23704ed

File tree

305 files changed

+20703
-24291
lines changed

Some content is hidden

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

305 files changed

+20703
-24291
lines changed

.eslintrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
'@vue/standard'
99
],
1010
parserOptions: {
11-
parser: 'babel-eslint'
11+
parser: '@babel/eslint-parser'
1212
},
1313
rules: {
1414
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
@@ -17,6 +17,7 @@ module.exports = {
1717
'vue/no-multiple-template-root': 'off',
1818
'no-unused-vars': 'warn',
1919
'space-before-function-paren': ['warn', 'never'],
20+
'vue/multi-word-component-names': 'off',
2021
indent: [2, 2]
2122
}
2223
}

.github/workflows/build-deploy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55
- master
66
jobs:
77
build-and-deploy:
8-
runs-on: ubuntu-18.04
8+
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout 🛎️
11-
uses: actions/checkout@v2.3.1
11+
uses: actions/checkout@v3
1212
- name: Build page
1313
run: |
1414
npm install
@@ -17,4 +17,4 @@ jobs:
1717
uses: JamesIves/[email protected]
1818
with:
1919
branch: gh-pages # The branch the action should deploy to.
20-
folder: dist # The folder the action should deploy.
20+
folder: docs # The folder the action should deploy.

.github/workflows/preview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
surge_token: ${{ secrets.SURGE_TOKEN }}
1919
github_token: ${{ secrets.GITHUB_TOKEN }}
20-
dist: dist
20+
dist: docs
2121
build: |
2222
echo "Has build already"
2323
- name: Get the preview_url

docs/404.html

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Single Page Apps for GitHub Pages</title>
6+
<script type="text/javascript">
7+
// Single Page Apps for GitHub Pages
8+
// MIT License
9+
// https://github.com/rafgraph/spa-github-pages
10+
// This script takes the current url and converts the path and query
11+
// string into just a query string, and then redirects the browser
12+
// to the new url with only a query string and hash fragment,
13+
// e.g. https://www.foo.tld/one/two?a=b&c=d#qwe, becomes
14+
// https://www.foo.tld/?/one/two&a=b~and~c=d#qwe
15+
// Note: this 404.html file must be at least 512 bytes for it to work
16+
// with Internet Explorer (it is currently > 512 bytes)
17+
18+
// If you're creating a Project Pages site and NOT using a custom domain,
19+
// then set pathSegmentsToKeep to 1 (enterprise users may need to set it to > 1).
20+
// This way the code will only replace the route part of the path, and not
21+
// the real directory in which the app resides, for example:
22+
// https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
23+
// https://username.github.io/repo-name/?/one/two&a=b~and~c=d#qwe
24+
// Otherwise, leave pathSegmentsToKeep as 0.
25+
var pathSegmentsToKeep = 0;
26+
27+
var l = window.location;
28+
l.replace(
29+
l.protocol + '//' + l.hostname + (l.port ? ':' + l.port : '') +
30+
l.pathname.split('/').slice(0, 1 + pathSegmentsToKeep).join('/') + '/?/' +
31+
l.pathname.slice(1).split('/').slice(pathSegmentsToKeep).join('/').replace(/&/g, '~and~') +
32+
(l.search ? '&' + l.search.slice(1).replace(/&/g, '~and~') : '') +
33+
l.hash
34+
);
35+
36+
</script>
37+
</head>
38+
<body>
39+
</body>
40+
</html>

CNAME renamed to docs/CNAME

File renamed without changes.
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
*** Settings ***
2+
Library InPageLibrary
3+
4+
*** Keywords ***
5+
Open Demo Page
6+
Open Browser Demo
7+
sleep 1sec
8+
9+
Set Username
10+
[Arguments] ${user}
11+
Type Text id=username_field ${user}
12+
13+
Set Password
14+
[Arguments] ${pwd}
15+
Type Text id=password_field ${pwd}
16+
17+
18+
Click Login
19+
Click id=login_button

docs/code/hello-world/test.robot

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
*** Settings ***
2+
Library CustomLibrary.py
3+
Resource keywords.resource
4+
Force Tags INCL
5+
6+
7+
*** Test Cases ***
8+
Log Python Keywords
9+
${ret}= My Keyword WORLD
10+
Log To Console ${ret} sdfsdf sdfsdf sdfsdf
11+
12+
Test
13+
Open Demo Page
14+
Set Username demo
15+
Set Password mode
16+
Click Login
17+
Sleep 1 sec
18+
Test
19+
o
20+
21+
Failed Test
22+
Open Demo Page
23+
Set Username demo
24+
Set Password Wrong
25+
Click Login
26+
Fail faked Fail...

docs/css/509.88b59296.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/542.ba620813.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/55.c4976d20.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/css/app.0a54051d.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/editor.worker.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/example/example.robot

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
*** Settings ***
2+
Documentation A test suite for valid login.
3+
...
4+
... Keywords are imported from the resource file
5+
Resource resource.robot
6+
7+
*** Test Cases ***
8+
Valid Login
9+
Open Login Page
10+
Input Credentials robot overloard
11+
Submit Credentials
12+
Welcome Page Should Be Open

0 commit comments

Comments
 (0)