Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0ae4786
Update upload-artifact action to version 3.1.0 in e2e tests workflow
thomasveltmann Apr 16, 2025
96015fa
Refactor NavBar tests to remove unnecessary use of act() for rendering
thomasveltmann Apr 16, 2025
ae7a828
chore: update package.json formatting and dependencies
thomasveltmann Apr 16, 2025
fb198a6
fix: update gradient colors type assertion in TechProviderCard and co…
thomasveltmann Apr 16, 2025
ae064f1
fix: update webpack config to use @expo/metro-config instead of @expo…
thomasveltmann Apr 16, 2025
57994cd
fix: add missing semicolon in webpack.config.js
thomasveltmann Apr 16, 2025
0dd4d47
chore: remove unused dependencies from package.json
thomasveltmann Apr 16, 2025
2d25f7e
fix: remove mock for NativeAnimatedHelper since the dependency is rem…
thomasveltmann Apr 16, 2025
6eb3861
fix: update upload-artifact
thomasveltmann Apr 16, 2025
8678f10
fix: add newline to trigger download
thomasveltmann Apr 16, 2025
654417f
fix: update upload-artifact action to version 4
thomasveltmann Apr 16, 2025
7c636b6
fix: update baseUrl in Cypress configuration
thomasveltmann Apr 16, 2025
b50a2fa
fix: update baseUrl in Cypress configuration and add wait-on timeout
thomasveltmann Apr 16, 2025
01d2346
fix: remove unnecessary newline in Cypress workflow
thomasveltmann Apr 16, 2025
978a052
fix: update baseUrl in Cypress configuration to match server settings
thomasveltmann Apr 16, 2025
7bf000c
Merge branch 'development' into WIN-54-Pipeline-fails-on-PR-to-Main
thomasveltmann Apr 16, 2025
5f171f6
Implement code changes to enhance functionality and improve performance
thomasveltmann Apr 16, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/app.e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
browser: ${{ matrix.test-platform }}

- name: Upload screenshots of failed tests
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
Expand Down
32 changes: 10 additions & 22 deletions __tests__/components/navbar/Navbar.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import { act } from 'react-dom/test-utils';
import { Provider } from 'react-redux';
import renderer from 'react-test-renderer';
import configureStore from 'redux-mock-store';
Expand All @@ -25,16 +24,11 @@ describe('NavBar Component', () => {
});

it('renders with showNavBar=true', () => {
let component;

act(() => {
component = renderer.create(
<Provider store={store}>
<NavBar />
</Provider>,
);
});
// @ts-ignore
const component = renderer.create(
<Provider store={store}>
<NavBar />
</Provider>,
);
const tree = component.toJSON();
expect(tree).toMatchSnapshot();
});
Expand All @@ -48,17 +42,11 @@ describe('NavBar Component', () => {
theme: 'light',
},
});

let component;

act(() => {
component = renderer.create(
<Provider store={store}>
<NavBar />
</Provider>,
);
});
// @ts-ignore
const component = renderer.create(
<Provider store={store}>
<NavBar />
</Provider>,
);
const tree = component.toJSON();
expect(tree).toMatchSnapshot();
});
Expand Down
2 changes: 0 additions & 2 deletions jest-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import '@testing-library/jest-native/extend-expect';
import { useAppSelector } from './src/lib/redux/Hooks';
import { ThemeState } from './src/lib/redux/slices/ThemeSlice';

// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
jest.mock('react-native-vector-icons/FontAwesome5', () => 'FontAwesome5');
jest.mock('react-native-webview', () => 'WebView');

Expand Down
190 changes: 0 additions & 190 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-community/eslint-config": "^3.2.0",
"@react-native-community/netinfo": "11.4.1",
"@react-navigation/bottom-tabs": "^7.2.0",
"@react-navigation/native": "^7.0.14",
"@react-navigation/native-stack": "^7.2.0",
"@react-navigation/routers": "^6.1.9",
Expand All @@ -60,7 +59,6 @@
"expo-linking": "~7.0.5",
"expo-router": "~4.0.20",
"expo-status-bar": "~2.0.1",
"expo-system-ui": "^4.0.9",
"expo-web-browser": "~14.0.2",
"i18next": "^23.7.6",
"openai": "^4.16.1",
Expand All @@ -74,10 +72,8 @@
"react-native-element-dropdown": "^2.10.4",
"react-native-error-boundary": "^1.2.3",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "~2.20.2",
"react-native-paper": "^5.11.2",
"react-native-progress": "^5.0.1",
"react-native-reanimated": "~3.16.7",
"react-native-render-html": "^6.3.4",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.4.0",
Expand All @@ -97,15 +93,9 @@
"devDependencies": {
"@babel/core": "^7.26.10",
"@babel/preset-env": "^7.26.9",
"@babel/runtime": "^7.26.10",
"@cypress/code-coverage": "^3.12.6",
"@react-native-community/cli": "^15.0.1",
"@react-native-community/cli-platform-android": "^15.0.1",
"@react-native-community/cli-platform-ios": "^15.0.1",
"@react-native/babel-preset": "^0.77.0",
"@react-native/eslint-config": "^0.77.0",
"@react-native/metro-config": "^0.77.0",
"@react-native/typescript-config": "^0.77.0",
"@testing-library/jest-native": "^5.4.3",
"@testing-library/react-native": "^12.4.0",
"@types/jest": "^29.5.5",
Expand Down
9 changes: 8 additions & 1 deletion src/components/WTR/Card/TechProviderCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,14 @@ export function TechProviderCard({
testID={`tech-provider-${techProviderSlug}-button`}
>
<LinearGradient
colors={colors.techProviderGradient}
colors={
colors.techProviderGradient as [
string,
string,
...string[],
]
}
// colors={colors.techProviderGradient}
style={styles.circle}
>
<Image source={techProviderImage} style={styles.image} />
Expand Down
2 changes: 1 addition & 1 deletion src/screens/Course/StageOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export default function StageOverview() {
marginLeft: 10,
},
courseBackgroundContainer: {
borderTopRadius: 15,
borderRadius: 15,
overflow: 'hidden',
},
courseTitle: {
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const createExpoWebpackConfigAsync = require('@expo/webpack-config');
const createExpoWebpackConfigAsync = require('@expo/metro-config');
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');

module.exports = async function (env, argv) {
Expand Down
Loading