Merge pull request #286 from crossroads/master

#November2019Release2
crossroads · Nov 25, 2019 · 9bc6d3e · 9bc6d3e
2 parents cc8475f + aaeb1a0
commit 9bc6d3e
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 137 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,5 +3,5 @@ gem "capistrano", "3.4.0"
 gem "rake"
 gem "fastlane"
 gem "cocoapods"
-gem "nokogiri" # for CircleCI v2 deployment to extract version number
+gem "nokogiri" , ">= 1.10.4" # for CircleCI v2 deployment to extract version number
 gem "plist"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -222,9 +222,9 @@ DEPENDENCIES
   capistrano (= 3.4.0)
   cocoapods
   fastlane
-  nokogiri
+  nokogiri (>= 1.10.4)
   plist
   rake
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/app/app.js b/app/app.js
@@ -1,15 +1,13 @@
-import Ember from 'ember';
-import Resolver from './resolver';
-import loadInitializers from 'ember-load-initializers';
-import config from './config/environment';
+import Ember from "ember";
+import Resolver from "./resolver";
+import loadInitializers from "ember-load-initializers";
+import config from "./config/environment";
 
 let App;
 
 window.EmberENV = window.EmberENV || {};
 window.EmberENV.ENABLE_DS_FILTER = true;
 
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,

diff --git a/tests/acceptance/authorization-test.js b/tests/acceptance/authorization-test.js
@@ -32,11 +32,6 @@ testSkip("Rediect to login if not logged-in", function() {
 
   visit("/offers");
 
-  andThen(function() {
-    equal(Ember.$.trim(Ember.$("#messageBoxText").text()), t("must_login").toString());
-    okClick();
-  });
-
   andThen(function() {
     equal(currentURL(), '/login');
   });