Skip to content

Commit 9a3defe

Browse files
aslilacaslilac
committed
Merge branch 'main' into provisioner-warning
2 parents 2f969b1 + efbd625 commit 9a3defe

File tree

109 files changed

+4204
-1246
lines changed

Some content is hidden

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

109 files changed

+4204
-1246
lines changed

‎.github/actions/setup-node/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ runs:
1313
- name: Install pnpm
1414
uses: pnpm/action-setup@v3
1515
with:
16-
version: 9
16+
version: 9.6
1717
- name: Setup Node
18-
uses: actions/setup-node@v4.0.1
18+
uses: actions/setup-node@v4.0.3
1919
with:
20-
node-version: 18.19.0
20+
node-version: 20.16.0
2121
# See https://github.com/actions/setup-node#caching-global-packages-data
2222
cache: "pnpm"
2323
cache-dependency-path: ${{ inputs.directory }}/pnpm-lock.yaml

‎.github/dependabot.yaml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,37 +86,30 @@ updates:
8686
- "@mui*"
8787
react:
8888
patterns:
89-
- "react*"
90-
- "@types/react*"
89+
- "react"
90+
- "react-dom"
91+
- "@types/react"
92+
- "@types/react-dom"
9193
emotion:
9294
patterns:
9395
- "@emotion*"
96+
exclude-patterns:
97+
- "jest-runner-eslint"
9498
eslint:
9599
patterns:
96100
- "eslint*"
97101
- "@typescript-eslint*"
98102
jest:
99103
patterns:
100-
- "jest*"
104+
- "jest"
101105
- "@types/jest"
102106
vite:
103107
patterns:
104108
- "vite*"
105109
- "@vitejs/plugin-react"
106110
ignore:
107-
# Ignore patch updates for all dependencies
111+
# Ignore major version updates to avoid breaking changes
108112
- dependency-name: "*"
109-
update-types:
110-
- version-update:semver-patch
111-
# Ignore major updates to Node.js types, because they need to
112-
# correspond to the Node.js engine version
113-
- dependency-name: "@types/node"
114113
update-types:
115114
- version-update:semver-major
116-
# Ignore @storybook updates, run `pnpm dlx storybook@latest upgrade` to upgrade manually
117-
- dependency-name: "*storybook*" # matches @storybook/* and storybook*
118-
update-types:
119-
- version-update:semver-major
120-
- version-update:semver-minor
121-
- version-update:semver-patch
122115
open-pull-requests-limit: 15

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ jobs:
184184
185185
# Check for any typos
186186
- name: Check for typos
187-
uses: crate-ci/typos@v1.23.5
187+
uses: crate-ci/typos@v1.23.6
188188
with:
189189
config: .github/workflows/typos.toml
190190

‎cli/notifications_test.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ import (
1616
"github.com/coder/coder/v2/testutil"
1717
)
1818

19+
func createOpts(t *testing.T) *coderdtest.Options {
20+
t.Helper()
21+
22+
dt := coderdtest.DeploymentValues(t)
23+
dt.Experiments = []string{string(codersdk.ExperimentNotifications)}
24+
return &coderdtest.Options{
25+
DeploymentValues: dt,
26+
}
27+
}
28+
1929
func TestNotifications(t *testing.T) {
2030
t.Parallel()
2131

@@ -42,7 +52,7 @@ func TestNotifications(t *testing.T) {
4252
t.Parallel()
4353

4454
// given
45-
ownerClient, db := coderdtest.NewWithDatabase(t, nil)
55+
ownerClient, db := coderdtest.NewWithDatabase(t, createOpts(t))
4656
_ = coderdtest.CreateFirstUser(t, ownerClient)
4757

4858
// when
@@ -72,7 +82,7 @@ func TestPauseNotifications_RegularUser(t *testing.T) {
7282
t.Parallel()
7383

7484
// given
75-
ownerClient, db := coderdtest.NewWithDatabase(t, nil)
85+
ownerClient, db := coderdtest.NewWithDatabase(t, createOpts(t))
7686
owner := coderdtest.CreateFirstUser(t, ownerClient)
7787
anotherClient, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
7888

@@ -87,7 +97,7 @@ func TestPauseNotifications_RegularUser(t *testing.T) {
8797
require.Error(t, err)
8898
require.ErrorAsf(t, err, &sdkError, "error should be of type *codersdk.Error")
8999
assert.Equal(t, http.StatusForbidden, sdkError.StatusCode())
90-
assert.Contains(t, sdkError.Message, "Insufficient permissions to update notifications settings.")
100+
assert.Contains(t, sdkError.Message, "Forbidden.")
91101

92102
// then
93103
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)

0 commit comments

Comments
 (0)