Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use proper generator package #181

Closed
wants to merge 4 commits into from
Closed

Use proper generator package #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa21a07
Use proper generator package
MaxStalker Sep 7, 2022
bdab96f
Commit changeset
MaxStalker Sep 7, 2022
83c7225
Fix basepath
MaxStalker Sep 29, 2022
f0a8dcb
Exclude dev tests and examples from running before publish
MaxStalker Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/happy-gifts-bake.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@onflow/flow-js-testing": patch
---

Fix imports for flow-cadut generator
5 changes: 2 additions & 3 deletions dev-test/utilities.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
builtInMethods,
playgroundImport,
} from "../src/transformers"
import {getManagerAddress} from "../src/manager"
import * as manager from "../src/manager"
import {query} from "@onflow/fcl"

Expand All @@ -30,8 +29,8 @@ jest.setTimeout(10000)
describe("block height offset", () => {
// Instantiate emulator and path to Cadence files
beforeEach(async () => {
const base = path.resolve(__dirname, "../cadence")
await init({base})
const basePath = path.resolve(__dirname, "../cadence")
await init(basePath)
return emulator.start()
})

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"<rootDir>/node_modules/"
],
"testMatch": [
"**/(test|examples|dev-test)/?(*.)+(spec|test).[jt]s?(x)"
"**/(test)/?(*.)+(spec|test).[jt]s?(x)"
]
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import {execSync} from "child_process"
import {writeFile} from "@onflow/flow-cadut/generator"
import {writeFile} from "@onflow/flow-cadut-generator"

import babelConfig from "../templates/babel-config"
import jestConfig from "../templates/jest-config"
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/make.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

import {writeFile} from "@onflow/flow-cadut/generator"
import {writeFile} from "@onflow/flow-cadut-generator"
import testTemplate from "../templates/test"

const hashedTimestamp = () => {
Expand Down