(#13) Use laxar-mocks instead of laxar-testing now

LaxarJS · Jan 8, 2016 · e7196d2 · e7196d2
1 parent 0b2f264
commit e7196d2
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 205 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,11 @@ node_js:
    - "0.12"
 env:
    matrix:
-      # Support the latest 1.0.x and 1.1.x versions
-      # GRUNT_LAXAR_VERSION=^0.8.0 LAXAR_VERSION=LaxarJS/laxar#^0.26.0
-      - GRUNT_LAXAR_VERSION=~1.0.0-0 LAXAR_VERSION=~1.0.0
-      - GRUNT_LAXAR_VERSION=~1.1.0-0 LAXAR_VERSION=~1.1.0
+      # Support the laxar 1.2.0-alpha.2 version
+      - GRUNT_LAXAR_VERSION=~1.1.2-0
+        LAXAR_VERSION=~1.2.0-alpha.2
+        LAXAR_UIKIT_VERSION=~1.1.0
+        LAXAR_PATTERNS_VERSION=~1.2.0-alpha.2
 before_install:
    - echo "{}" > "package.json"
    - export PATH="$PATH:$(npm bin)"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Last Changes
 
+- [#13](https://github.com/LaxarJS/ax-media-widget/issues/13): Use laxar-mocks instead of laxar-testing now
+
+
 ## v2.2.0
 
 - [#12](https://github.com/LaxarJS/ax-media-widget/issues/12): Expanded the widget definition

diff --git a/bower.json b/bower.json
@@ -7,13 +7,13 @@
       "url": "https://github.com/LaxarJS/ax-media-widget.git"
    },
    "dependencies": {
-      "laxar": "^1.0.0",
-      "laxar-patterns": "^1.0.0",
-      "laxar-uikit": "^1.0.0",
+      "laxar": "~1.2.0-alpha.2",
+      "laxar-patterns": "~1.2.0-alpha.2",
+      "laxar-uikit": "~1.1.0",
+
       "angular": "angular/bower-angular#*"
    },
    "devDependencies": {
-      "es5-shim": "es-shims/es5-shim#^2.3.x",
-      "jasmine": "pivotal/jasmine#^1.3.x"
+      "laxar-mocks": "1.0.0-alpha.1"
    }
 }