Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Ember2.x tests #178

Merged
merged 21 commits into from
Oct 7, 2015
Merged

Ember2.x tests #178

merged 21 commits into from
Oct 7, 2015

Conversation

taras
Copy link
Contributor

@taras taras commented Oct 2, 2015

  • Added ability to load an in-memory database with fixtures with loadPouchDump helper
  • Added authenticateUser helper

@billybonks
Copy link
Contributor

I thought we werent going to use mirage?

@taras
Copy link
Contributor Author

taras commented Oct 4, 2015

We didn't end up using it. I'm still using it to install Pretender which is used to mock authentication requests. We can remove it if there is preference to not have it in and just install Pretender manually.

@jkleinsc
Copy link
Member

jkleinsc commented Oct 6, 2015

@taras if we aren't using mirage, can you remove it from this PR?

@taras
Copy link
Contributor Author

taras commented Oct 6, 2015

It's providing Pretender, I'll remove it and install Pretender another way

@taras
Copy link
Contributor Author

taras commented Oct 7, 2015

@jkleinsc I just pushed a commit that replaces ember-cli-mirage with ember-cli-fake-server. They both use Pretender but ember-cli-fake-server is simpler and doesn't provide any fixture functionality.


database: Ember.inject.service(),
mainDB: Ember.computed.alias('database.mainDB'),
db: Ember.computed.alias('database.mainDB'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we merge mainDB and db into one since they point to the same thing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have another PR in the works that removes mainDB because it's not being used in this adapter.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@jkleinsc
Copy link
Member

jkleinsc commented Oct 7, 2015

I am working on refactoring the config db/service to remove the config adapter and not use ember data for the config data. Eventually the config db will be replaced

'simple-auth': {

},
'ember-cli-mirage': {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remanent of cli mirage.

@billybonks
Copy link
Contributor

In the future can we merge whitespace changes into a separate commit? makes it easier to read :)

@taras
Copy link
Contributor Author

taras commented Oct 7, 2015

@billybonks I'm with you but I think it might be done by the editor which is removing the whitespaces. I'll do my best for the future :)

@jkleinsc
Copy link
Member

jkleinsc commented Oct 7, 2015

@taras and @billybonks I think I would like to cleanup all of the whitespace/indent spacing on the files for consistency and am thinking of adding ember suave to enforce/cleanup formatting. It's my bad for not having an explicit style guide, but I think it makes sense to use the defaults from ember suave.

@taras
Copy link
Contributor Author

taras commented Oct 7, 2015

@jkleinsc +1 on using ember-suave

@jkleinsc jkleinsc merged commit 1453595 into HospitalRun:master Oct 7, 2015
@taras taras deleted the ember2.x-tests branch October 7, 2015 17:15
@taras
Copy link
Contributor Author

taras commented Oct 7, 2015

@jkleinsc we probably should have squashed those commits. Agree?

@jkleinsc
Copy link
Member

jkleinsc commented Oct 7, 2015

@taras what commits?

@taras
Copy link
Contributor Author

taras commented Oct 7, 2015

The 21 commits that we just merged. I'm just saying that for the sake of keeping history clean, we could squash the commits before merging into master.

@jkleinsc
Copy link
Member

jkleinsc commented Oct 7, 2015

Yes... I'm not sure if that just happened because I did a manual merge.

@billybonks
Copy link
Contributor

👍 to squashing, @taras ye its the editor mine does the same, i just stage the white space hunks and commit them with fix up. @jkleinsc ember-suave is good defaults, i'm not sure what editor you use, but if you want to fix whitespace sublime and atom, automatically fix it if you open it and save, so you could go open everything save commit 😄. @taras thanks for this.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants