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.

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

Fix: cypress tests #205

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@ jobs:
DJANGO_DEBUG: "False"
DOMAIN_NAMES: "arches"
PYTHONUNBUFFERED: "0"
STATIC_URL: "/static/"
STATIC_ROOT: "/static_root"
WEB_ROOT: "/web_root"
TZ: "PST"
ports:
- '8000:8000'
Expand Down
2 changes: 1 addition & 1 deletion coral/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
pass

APP_NAME = 'coral'
APP_VERSION = semantic_version.Version(major=2, minor=44, patch=39)
APP_VERSION = semantic_version.Version(major=2, minor=44, patch=40)

GROUPINGS = {
"groups": {
Expand Down
33 changes: 19 additions & 14 deletions coral/templates/index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
</head>

<body>
<script src="{% webpack_static 'node_modules/requirejs/require.js' %}"></script>
{% include 'javascript.htm' %}
{% comment %} <script src="{% webpack_static 'node_modules/requirejs/require.js' %}"></script>
{% include 'javascript.htm' %} {% endcomment %}

<!--=== Header ===-->
<header>
Expand Down Expand Up @@ -440,7 +440,7 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>
<script src="//cdnjs.cloudflare.com/ajax/libs/owl-carousel/1.3.3/owl.carousel.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.form/3.51/jquery.form.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.15.0/jquery.validate.min.js"></script>
<script src="{% webpack_static 'plugins/revolution-slider/rs-plugin/js/jquery.themepunch.tools.min.js' %}"></script>
{% comment %} <script src="{% webpack_static 'plugins/revolution-slider/rs-plugin/js/jquery.themepunch.tools.min.js' %}"></script>
<script src="{% webpack_static 'plugins/revolution-slider/rs-plugin/js/jquery.themepunch.revolution.min.js' %}"></script>
<script src="{% webpack_static 'plugins/cube-portfolio/cubeportfolio/js/jquery.cubeportfolio.min.js' %}"></script>
<script src="{% webpack_static 'plugins/one.app.js' %}"></script>
Expand All @@ -449,23 +449,28 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>
<script src="{% webpack_static 'plugins/style-switcher.js' %}"></script>
<script src="{% webpack_static 'plugins/revolution-slider.js' %}"></script>
<script src="{% webpack_static 'plugins/cube-portfolio-lightbox.js' %}"></script>
<script src="{% webpack_static 'node_modules/knockout/build/output/knockout-latest.js' %}"></script>
<script src="{% webpack_static 'node_modules/knockout/build/output/knockout-latest.js' %}"></script> {% endcomment %}


<script>
jQuery(document).ready(function() {
App.init();
App.initCounter();
App.initParallaxBg();
OwlCarousel.initOwlCarousel();
StyleSwitcher.initStyleSwitcher();
RevolutionSlider.initRSfullScreen();
});
<script defer>
// jQuery(document).ready(function() {
// App.init();
// App.initCounter();
// App.initParallaxBg();
// OwlCarousel.initOwlCarousel();
// StyleSwitcher.initStyleSwitcher();
// RevolutionSlider.initRSfullScreen();
// });

var ViewModel = function(first, last) {
{% comment %} var ViewModel = function(first, last) {
console.log('failed')
this.showAuthMenu = ko.observable(false);
console.log('failed 2')

};
console.log('failed 3')
ko.applyBindings(new ViewModel());
console.log('failed 4') {% endcomment %}

</script>

Expand Down
2 changes: 2 additions & 0 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
Cypress.Commands.add("login", () => {
cy.visit('/auth/?next=/index.htm');

cy.wait(5000);

cy.get('.input-group > .floating-label-group > input[name="username"].form-control').type(`admin{enter}`);
cy.get('.input-group > .floating-label-group > input[name="password"].form-control').type(`admin{enter}`);

Expand Down
Loading