Merge branch 'development' into sidebarfilter

fossasia · Jun 17, 2019 · deb5fc2 · deb5fc2
2 parents c88b937 + 402b556
commit deb5fc2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/app/components/widgets/forms/location-input.js b/app/components/widgets/forms/location-input.js
@@ -17,8 +17,17 @@ export default Component.extend({
     return values(this.address).join(' ').trim();
   }),
 
-  placeNameChanger: observer('combinedAddress', function() {
-    this.set('placeName', this.combinedAddress);
+  searchableAddress: computed('address.{city}', function() {
+    return this.address.city;
+  }),
+
+  placeNameChanger: observer('combinedAddress', 'searchableAddress', function() {
+    this.setProperties(
+      { 'placeName'      : this.combinedAddress,
+        'searchableName' : this.searchableAddress
+      }
+    );
+
   }),
 
   actions: {

diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js
@@ -20,7 +20,7 @@ export default Controller.extend({
       title        : 'Total Amount'
     },
     {
-      propertyName : 'tickets.length',
+      propertyName : 'attendees.length',
       title        : 'Quantity'
     },
     {

diff --git a/app/templates/components/forms/wizard/basic-details-step.hbs b/app/templates/components/forms/wizard/basic-details-step.hbs
@@ -10,6 +10,7 @@
       lat=data.event.latitude
       lng=data.event.longitude
       placeName=data.event.locationName
+      searchableName=data.event.searchableLocationName
       zoom=15
       placeholder=(t 'Location is required to make this event live')}}
       <div class="inline field">

diff --git a/tests/helpers/custom-helpers.js b/tests/helpers/custom-helpers.js
@@ -1,4 +1,4 @@
-import { click, fillIn, currentURL, visit } from '@ember/test-helpers';
+import { click, fillIn, currentURL, visit, settled } from '@ember/test-helpers';
 import { currentSession } from 'ember-simple-auth/test-support';
 
 export async function login(assert, email = null, password = null, gotoLoginPage = true) {
@@ -9,10 +9,12 @@ export async function login(assert, email = null, password = null, gotoLoginPage
   await fillIn('input[name=email]', email !== null ? email : 'opev-fe@test.com');
   await fillIn('input[name=password]', password !== null ? password : 'test-fe-user');
   await click('button[type=submit]');
+  await settled();
 }
 
 export async function logout(assert) {
   await visit('/logout');
+  await settled();
   assert.equal(currentURL(), '/');
   assert.ok(currentSession().session.isAuthenticated !== true);
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1533,6 +1533,7 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -6729,8 +6730,9 @@ esprima@^2.6.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esprima@~3.0.0:
   version "3.0.0"
@@ -9036,27 +9038,13 @@ js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.12.0:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.13.1:
+js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.7.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.7.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -13063,6 +13051,7 @@ sprintf-js@^1.0.3:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 srcset@^1.0.0:
   version "1.0.0"