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.

Sign up for GitHub

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

Jump to bottom

Have mirage get namespace from environment. (For frost-guide when it … #22

Merged
merged 2 commits into from
Apr 4, 2016
Merged

Have mirage get namespace from environment. (For frost-guide when it … #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d6a6f
Have mirage get namespace from environment. (For frost-guide when it …
EWhite613 Apr 1, 2016
f118d49
Update test to use an existing icon
EWhite613 Apr 1, 2016
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
4 changes: 2 additions & 2 deletions tests/dummy/app/mirage/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import config from '../config/environment'

export default function () {
if (config && config.isDemo) {
this.namespace = 'https://ciena-frost.github.io'
if (config && config.mirageNamespace) {
this.namespace = config.mirageNamespace
}

this.get('/list-items', function (db) {
Expand Down
1 change: 1 addition & 0 deletions tests/dummy/config/environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ module.exports = function (environment) {
if (environment === 'production') {
ENV.baseURL = '/ember-frost-list'
ENV.isDemo = true
ENV.mirageNamespace = 'https://ciena-frost.github.io'
ENV['ember-cli-mirage'] = {
enabled: true
}
Expand Down
132 changes: 66 additions & 66 deletions tests/integration/components/frost-list-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,39 +42,39 @@ describeComponent(
})

this.render(hbs `
{{#frost-list
class='frost-flex-1'
onScrollYEnd=(action 'yEndReached')
onSelect=(action 'selected')
records=model
selections=items
as |record|
}}
{{#if (eq record.record-type 'custom')}}
<div class="frost-list-item terse frost-list-user">
<div class='icon'>
{{frost-icon icon='frost/service'}}
</div>
<div class='block frost-flex-1'>
<div class='primary name'>Glanzer, Steven</div>
<div class='tertiary'>
<span class='label'>Email:</span>sglanzer@gmail.com</div>
</div>
<div class='block frost-flex-1'>
<div class='secondary'>Application access</div>
<div class='tertiary'>None</div>
</div>
<div class='block frost-flex-1'>
<div class='secondary'>API keys</div>
<div class='tertiary'>None</div>
</div>
<div class='block frost-flex-1'>
<div class='secondary'>Enabled</div>
</div>
</div>
{{/if}}
{{/frost-list}}
`)
{{#frost-list
class='frost-flex-1'
onScrollYEnd=(action 'yEndReached')
onSelect=(action 'selected')
records=model
selections=items
as |record|
}}
{{#if (eq record.record-type 'custom')}}
<div class="frost-list-item terse frost-list-user">
<div class='icon'>
{{frost-icon icon='frost/info'}}
</div>
<div class='block frost-flex-1'>
<div class='primary name'>Glanzer, Steven</div>
<div class='tertiary'>
<span class='label'>Email:</span>sglanzer@gmail.com</div>
</div>
<div class='block frost-flex-1'>
<div class='secondary'>Application access</div>
<div class='tertiary'>None</div>
</div>
<div class='block frost-flex-1'>
<div class='secondary'>API keys</div>
<div class='tertiary'>None</div>
</div>
<div class='block frost-flex-1'>
<div class='secondary'>Enabled</div>
</div>
</div>
{{/if}}
{{/frost-list}}
`)

assert.lengthOf(this.$('.frost-list-item'), 1)
expect(this.$()).to.have.length(1)
Expand Down Expand Up @@ -102,39 +102,39 @@ describeComponent(
// })
//
// this.render(hbs `
// {{#frost-list
// class='frost-flex-1'
// onScrollYEnd=(action 'yEndReached')
// onSelect=(action 'selected')
// records=model
// selections=items
// as |record|
// }}
// {{#if (eq record.record-type 'custom')}}
// <div class="frost-list-item terse frost-list-user">
// <div class='icon'>
// {{frost-icon icon='frost/service'}}
// </div>
// <div class='block frost-flex-1'>
// <div class='primary name'>Glanzer, Steven</div>
// <div class='tertiary'>
// <span class='label'>Email:</span>sglanzer@gmail.com</div>
// </div>
// <div class='block frost-flex-1'>
// <div class='secondary'>Application access</div>
// <div class='tertiary'>None</div>
// </div>
// <div class='block frost-flex-1'>
// <div class='secondary'>API keys</div>
// <div class='tertiary'>None</div>
// </div>
// <div class='block frost-flex-1'>
// <div class='secondary'>Enabled</div>
// </div>
// </div>
// {{/if}}
// {{/frost-list}}
// `)
// {{#frost-list
// class='frost-flex-1'
// onScrollYEnd=(action 'yEndReached')
// onSelect=(action 'selected')
// records=model
// selections=items
// as |record|
// }}
// {{#if (eq record.record-type 'custom')}}
// <div class="frost-list-item terse frost-list-user">
// <div class='icon'>
// {{frost-icon icon='frost/service'}}
// </div>
// <div class='block frost-flex-1'>
// <div class='primary name'>Glanzer, Steven</div>
// <div class='tertiary'>
// <span class='label'>Email:</span>sglanzer@gmail.com</div>
// </div>
// <div class='block frost-flex-1'>
// <div class='secondary'>Application access</div>
// <div class='tertiary'>None</div>
// </div>
// <div class='block frost-flex-1'>
// <div class='secondary'>API keys</div>
// <div class='tertiary'>None</div>
// </div>
// <div class='block frost-flex-1'>
// <div class='secondary'>Enabled</div>
// </div>
// </div>
// {{/if}}
// {{/frost-list}}
// `)
//
// assert.lengthOf(this.$('.frost-list-item'), 1)
// Ember.run(() => $('.frost-list-item').eq(0).click())
Expand Down