Skip to content
This repository has been archived by the owner on May 5, 2018. It is now read-only.

[CodeMirror] UI-Refresh, unit tests fix, and 3.02 update #412

Merged
merged 6 commits into from Feb 11, 2013
Merged

[CodeMirror] UI-Refresh, unit tests fix, and 3.02 update #412

merged 6 commits into from Feb 11, 2013

Conversation

douglasduteil
Copy link
Contributor

Hi @ProLoser

Inspired by your last commits #316 I fixed my commented unit tests, added your ui-refresh and updated the CodeMirror version to 3.02.

@ProLoser
Copy link
Member

ProLoser commented Feb 9, 2013

Very cool. So this is an alternative to #316?

scope.foo = 'bar';
scope.$apply();
$timeout.flush();
expect($.trim(element.siblings().text())).toBe(scope.foo);
Copy link
Member

Choose a reason for hiding this comment

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

When I test locally this seems to be failing :(

@ProLoser
Copy link
Member

ProLoser commented Feb 9, 2013

Looks like travis only ran 1 test (need to open a bug on testacular about this).

Go to travis, login with your github account, and in the dropdown menu of the build choose 'restart build'. Then scroll to the bottom of the build when it's done and confirm all tests ran. I don't get why when testacular does this and it drives me fucking nuts.

@douglasduteil
Copy link
Contributor Author

K
I fixed some minor bug and now Travis do all the tests :)

It was there since the 90th travis build (the one that changes the Testacular version from "~0.2.0" to "~0.4.0").

@ProLoser
Copy link
Member

There are merge conflicts with master. Additionally, I am getting lots of wonderful problems with my own tests so I may have to let someone else handle this.

Can you pull the latest ui/master version and push the conflict resolution for me? Perhaps I'm resolving things incorrectly.

Also, I know there was an (unrelated) discussion about using elm.type vs elm.tagName.toLowerCase() but since type is always available for textarea and since this directive will never be used with any other DOM element, can you revert it back to using 'type'?

Sorry for all the hassle lol. We are ALMOST THERE!

@douglasduteil
Copy link
Contributor Author

I tried to rebase my repo on angular-ui/angular-ui remote master branch . Is it better ?

@ProLoser ProLoser merged commit cbcfbaa into angular-ui:master Feb 11, 2013
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