Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
Jasmine needs to be listed as a framework
Browse files Browse the repository at this point in the history
karma conf is now exported functions

how embarrassing - now it really should work

need ng-scenario for e2e tests

need karma-junit-reporter

trying without jasmine

trying some other plugins

adding jasmine in

I will stab someone

ng-scenario is probably needed

trying adding karma-ng-scenario

need a package.json to specify dev deps

normalise quotes
  • Loading branch information
michaelneale authored and btford committed Nov 5, 2013
1 parent dab5676 commit 5307e33
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
logs/*
!.gitkeep
node_modules/

4 comments on commit 5307e33

@eternalmatt
Copy link

Choose a reason for hiding this comment

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

What is the purpose of this commit and its message?

@petebacondarwin
Copy link
Contributor

Choose a reason for hiding this comment

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

@eternalmatt - That is a very good question!! :-) I think this commit was the victim of a rebase, where its change was subsumed into a previous commit already and so when it is was re-committed there was basically nothing left here. It is a rather entertaining if somewhat confusing commit message. It is probably best to simply squash the commit altogether to avoid further confusion.

@eternalmatt
Copy link

Choose a reason for hiding this comment

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

No worries, I assumed the message was the result of some rebase tool, but was really confused why the result of the rebase was just removing one line in a file. And also how did it get to the point where @btford merged it?

Side question, why are all the commits in this project "authored" so long ago and only committed now? see https://github.com/angular/angular-phonecat/commits/master
IgorMinar authored 3 years ago
petebacondarwin committed 2 days ago

@petebacondarwin
Copy link
Contributor

@petebacondarwin petebacondarwin commented on 5307e33 Nov 11, 2013 via email

Choose a reason for hiding this comment

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

Please sign in to comment.