Skip to content

Commit

Permalink
Merge feature/advancedtests
Browse files Browse the repository at this point in the history
Fix auto zoom
Add free quota exceeded message
Disable full screen
Support context in data source microflow
End 2 End Travis tests
  • Loading branch information
Andries-Smit authored Aug 31, 2017
2 parents 888e1d0 + 1941012 commit 6ae695e
Show file tree
Hide file tree
Showing 23 changed files with 3,366 additions and 1,846 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.idea/*
dist/
localSettings.js
node_modules/
41 changes: 28 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
sudo: required
dist: trusty

language: node_js
node_js:
- "6"

- "6"
before_install:
- npm i -g npm
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

- npm i -g npm
- npm install grunt-cli -g
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- wget -q -O - http://opensource.wandisco.com/wandisco-debian.gpg | sudo apt-key add -
- sudo sh -c "echo 'deb http://opensource.wandisco.com/debian/ wheezy svn17' > /etc/apt/sources.list.d/wandisco-subversion.list"
- sudo apt-get -qq update
- sudo apt-get install -y --allow-downgrades subversion=1.7.22-1+WANdisco libsvn1=1.7.22-1+WANdisco
- svn --version
after_success:
- bash <(curl -s https://codecov.io/bash)

cache:
directories:
- "node_modules"
- bash <(curl -s https://codecov.io/bash)
env:
global:
- MX_APP_NAME=googlemaps101
- MX_BRANCH_NAME=trunk
- MX_PROJECT_ID=022bb187-ef0f-4706-9fd5-2712bdf7736a
- MX_ENVIRONMENT=Sandbox
- [email protected]
deploy:
provider: releases
api_key: $GITHUB_KEY
file_glob: true
file: dist/release/*
skip_cleanup: true
on:
repo: $TRAVIS_REPO_SLUG
tags: true
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ module.exports = function(grunt) {
"./dist/" + pkg.version + "/" + pkg.widgetName + "/*",
"./dist/tmp/**/*",
"./dist/MxTestProject/deployment/web/widgets/" + pkg.widgetName + "/*",
"./dist/MxTestProject/widgets/" + pkg.widgetName + ".mpk"
"./dist/MxTestProject/widgets/" + pkg.widgetName + ".mpk",
"./dist/wdio/**/*"
]
},

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[![Dependency Status](https://david-dm.org/mendixlabs/google-maps.svg)](https://david-dm.org/mendixlabs/google-maps)
[![Dev Dependency Status](https://david-dm.org/mendixlabs/google-maps.svg#info=devDependencies)](https://david-dm.org/mendixlabs/google-maps#info=devDependencies)
[![codecov](https://codecov.io/gh/mendixlabs/google-maps/branch/master/graph/badge.svg)](https://codecov.io/gh/mendixlabs/google-maps)
![badge](https://img.shields.io/badge/mendix-7.6.0-green.svg)

# Google Maps
* Show locations on google maps
Expand Down
21 changes: 15 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = function(config) {
});
}

config.set({
const configuration = {
basePath: "",
frameworks: [ "jasmine" ],
files: [
Expand All @@ -40,12 +40,18 @@ module.exports = function(config) {
preprocessors: { "tests/test-index.js": [ "webpack", "sourcemap" ] },
webpack: webpackConfig,
webpackServer: { noInfo: true },
reporters: [ "progress", config.codeCoverage ? "coverage" : "kjhtml" ],
reporters: [ "spec", config.codeCoverage ? "coverage" : "kjhtml" ],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: [ "Chrome" ],
customLaunchers: {
Chrome_travis_ci: {
base: "Chrome",
flags: [ "--no-sandbox" ]
}
},
singleRun: false,
concurrency: Infinity,
coverageReporter: {
Expand All @@ -54,9 +60,12 @@ module.exports = function(config) {
{ type: "json", subdir: ".", file: "coverage.json" },
{ type: "text" }
]
},
jasmineNodeOpts: {
defaultTimeoutInterval: 10000
}
});
};

if (process.env.TRAVIS) {
configuration.browsers = [ "Chrome_travis_ci" ];
}

config.set(configuration);
};
Loading

0 comments on commit 6ae695e

Please sign in to comment.