Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
logging-scratch-gui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Goessmann
logging-scratch-gui
Commits
04fe42bd
Commit
04fe42bd
authored
6 years ago
by
Paul Kaplan
Browse files
Options
Downloads
Patches
Plain Diff
Use path.resolve the same way the build is loaded
parent
c6055710
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/integration/costumes.test.js
+2
-2
2 additions, 2 deletions
test/integration/costumes.test.js
test/integration/sprites.test.js
+2
-2
2 additions, 2 deletions
test/integration/sprites.test.js
with
4 additions
and
4 deletions
test/integration/costumes.test.js
+
2
−
2
View file @
04fe42bd
...
...
@@ -139,7 +139,7 @@ describe('Working with costumes', () => {
.
perform
();
await
driver
.
sleep
(
500
);
// Wait for thermometer menu to come up
const
input
=
await
findByXpath
(
'
//input[@type="file"]
'
);
await
input
.
sendKeys
(
path
.
join
(
process
.
cwd
(),
'
test
'
,
'
integration
'
,
'
fixtures
'
,
'
100-100.svg
'
));
await
input
.
sendKeys
(
path
.
resolve
(
__dirname
,
'
../
fixtures
/
100-100.svg
'
));
await
clickText
(
'
100-100
'
,
scope
.
costumesTab
);
// Name from filename
await
clickText
(
'
100 x 100
'
,
scope
.
costumesTab
);
// Size is right
const
logs
=
await
getLogs
();
...
...
@@ -155,7 +155,7 @@ describe('Working with costumes', () => {
.
perform
();
await
driver
.
sleep
(
500
);
// Wait for thermometer menu to come up
const
input
=
await
findByXpath
(
'
//input[@type="file"]
'
);
await
input
.
sendKeys
(
path
.
join
(
process
.
cwd
(),
'
test
'
,
'
integration
'
,
'
fixtures
'
,
'
gh-3582-png.png
'
));
await
input
.
sendKeys
(
path
.
resolve
(
__dirname
,
'
../
fixtures
/
gh-3582-png.png
'
));
await
clickText
(
'
gh-3582-png
'
,
scope
.
costumesTab
);
const
logs
=
await
getLogs
();
await
expect
(
logs
).
toEqual
([]);
...
...
This diff is collapsed.
Click to expand it.
test/integration/sprites.test.js
+
2
−
2
View file @
04fe42bd
...
...
@@ -83,7 +83,7 @@ describe('Working with sprites', () => {
.
perform
();
await
driver
.
sleep
(
500
);
// Wait for thermometer menu to come up
const
input
=
await
findByXpath
(
'
//input[@type="file"]
'
);
await
input
.
sendKeys
(
path
.
join
(
process
.
cwd
(),
'
test
'
,
'
fixtures
'
,
'
gh-3582-png.png
'
));
await
input
.
sendKeys
(
path
.
resolve
(
__dirname
,
'
../
fixtures
/
gh-3582-png.png
'
));
await
clickText
(
'
gh-3582-png
'
,
scope
.
spriteTile
);
const
logs
=
await
getLogs
();
await
expect
(
logs
).
toEqual
([]);
...
...
@@ -99,7 +99,7 @@ describe('Working with sprites', () => {
.
perform
();
await
driver
.
sleep
(
500
);
// Wait for thermometer menu to come up
const
input
=
await
findByXpath
(
'
//input[@type="file"]
'
);
await
input
.
sendKeys
(
path
.
join
(
process
.
cwd
(),
'
test
'
,
'
fixtures
'
,
'
100-100.svg
'
));
await
input
.
sendKeys
(
path
.
resolve
(
__dirname
,
'
../
fixtures
/
100-100.svg
'
));
await
clickText
(
'
100-100
'
,
scope
.
spriteTile
);
// Sprite is named for costume filename
// Check to make sure the size is right
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment