a85c3a4da8
Check for descriptor
2015-10-26 17:03:45 -07:00
0b1e1a0401
Merge branch 'StephanBijzitter-throw-for-constants'
...
Fixes #948
2015-10-26 16:30:01 -07:00
3374415add
Merge pull request #954 from matthewhuff89/remove_goals_md
...
Removed GOALS_2.0.md, doesn't seem to be needed anymore
2015-10-26 14:58:03 -07:00
c2ae3b6b12
Remove unused parameter from toThrowError
2015-10-26 11:43:31 -04:00
110cacab19
Added a throw error block in describe incase a function with arguments is passed in describe
2015-10-25 14:13:14 -04:00
db7879a478
Removed GOALS_2.0.md, doesn't seem to be needed anymore
2015-10-25 13:03:46 -04:00
e7dbc75fc2
feat(spy): add option to respy
...
will not throw error if spyOn called on a spy
fixes #931
2015-10-24 08:37:33 +03:00
a81466d9e7
Abort spying when the target cannot be spied on
2015-10-21 12:44:52 +02:00
48f42eaa7d
Merge branch 'lalunamel-master'
...
Merges #942
Fixes #930
Fixes #912
2015-10-15 09:21:57 -07:00
e5c2572753
Change #xit so that it will output a more BDD-style pending message
2015-10-14 21:03:47 -06:00
141fd910f2
Use className instead of class when creating DOM elements
2015-10-06 09:10:22 -07:00
a93bfd2120
Merge branch 'marcioj-random-tests'
2015-10-04 14:03:30 -07:00
4221b2d2c4
Merge branch 'random-tests' of https://github.com/marcioj/jasmine into marcioj-random-tests
2015-10-04 14:03:17 -07:00
6ee7fd6ced
Merge branch 'toString_fallback' of https://github.com/myitcv/jasmine into myitcv-toString_fallback
2015-10-04 13:47:27 -07:00
878325e2cf
Merge branch 'James-Dunn-patch-1'
2015-10-04 13:45:10 -07:00
80c4f87dd5
Fix circles/x from getting cut off on Mac/chrome
2015-09-27 17:01:08 +04:00
3f3fa484b2
Allow tests to run in random order
2015-09-26 14:53:08 -03:00
d0ad9b98cd
Use toString for objects if it has been overriden
2015-09-25 20:19:48 +01:00
375a6f9fda
Merge branch 'danielalexiuc-master'
...
- Fixes #924
- Fixes #917
2015-09-24 12:58:56 -07:00
c017f0000d
Postpone find() until it is needed
...
This is a fix for issue #917 .
It seems that 'symbols' was originally included as a performance optimization, to avoid repeated find() calls for '.jasmine-symbol-summary'. However this find() occasionally fails during initialize if the dom has not loaded completely.
This change will not affect performance, as symbols is still cached. However it improves upon the original code in that the find happens at a stage much later than initialize.
2015-09-16 11:52:05 +10:00
4097718b66
Merge pull request #906 from soycode/master
...
check for global before assigning
2015-09-03 13:38:21 -07:00
825dab32ff
Merge pull request #908 from mcamac/master
...
Reverse suite afterEach behavior to match semantics?
2015-09-01 21:33:52 -07:00
f3a7396845
afterEach behavior
2015-08-18 17:55:03 -04:00
850bee5492
check for global before assigning
2015-08-17 14:20:52 -07:00
6028a5d92c
Merge branch 'SimenB-badges'
2015-08-10 10:39:39 -07:00
93a13ab791
Use badges from shields.io
2015-08-08 07:54:15 +02:00
542f483228
Force the safari 8.1 version to be a string for sauce
2015-08-04 15:11:39 -07:00
459b4c29b6
Drop Safari 5 on OS-X from the build matrix
...
- SauceLabs no longer supports it
- Add Safari 8.1
2015-08-04 09:40:37 -07:00
750a9aac6d
Merge pull request #869 from ljwall/jasmine
...
Fixes #855
2015-08-03 15:01:43 -07:00
cd55f03912
concat files for toHaveBeenCalledTimes matcher
2015-08-03 14:57:52 -07:00
79954311fb
Merge pull request #892 from obastemur/patch-1
...
Update glob to latest
2015-07-16 12:10:21 -07:00
3f71bcdb2d
Update glob to latest
...
Fixes https://github.com/jasmine/jasmine/issues/891
2015-07-15 02:37:36 +03:00
06f05ac57b
Add notes about "ready for work" label
2015-07-02 14:52:17 -07:00
5ea5ec6004
Merge branch 'kkirsche-patch-1'
2015-06-12 13:25:37 -07:00
f7033f6551
Remove moot version property from bower.json
...
Per bower/bower.json-spec@a325da3
2015-06-10 18:36:17 -04:00
7e6e905814
Merge branch 'logankd-toHaveBeenCalledTimes'
...
Fixes #871
2015-06-05 21:09:51 -07:00
a6a1962924
add toHaveBeenCalledTimes matcher
...
Fix #853
2015-06-05 21:07:24 -07:00
50944fea6f
Mention use of bundle exec for running the jasmine server during dev
2015-06-05 20:36:56 -07:00
7bfc4c0a45
xdescribe marks pending, plus associated tests.
2015-05-29 17:21:28 +01:00
4be2079482
Use the travis sauce connect addon
2015-05-18 17:04:21 -07:00
d6f47ea886
Merge pull request #856 from lpww/patch-1
...
Update CONTRIBUTING.md
2015-05-18 14:29:44 -07:00
5061dd066c
Merge branch 'unique-css-classes' of https://github.com/prather-mcs/jasmine into prather-mcs-unique-css-classes
2015-05-18 14:29:03 -07:00
2a847a67e3
Merge branch 'danfinnie-any-vs-anything-error'
2015-05-18 14:27:27 -07:00
50223d97d6
Update CONTRIBUTING.md
...
Rephrase confusing statement:
From:
If when you run ($ grunt)...you see that JSHint runs your system is ready.
To:
Now run ($ grunt)...if you see that JSHint runs, your system is ready.
2015-05-17 11:49:39 -07:00
302e78f1df
Raise an error when jasmine.any() isn't passed a constructor
2015-05-17 02:21:26 -04:00
42ad12ec52
Make the HtmlReport CSS classes "unique enough"
...
The only difference between this commit and the previous is that I have
used a difference scheme for naming Jasmine CSS classes.
Instead of appending "_jasmine-css" to all Jasmine CSS selectors, I have
now preprended "jasmine-" instead.
2015-05-14 14:23:06 -07:00
c41fa7d156
Make the HtmlReport CSS classes "unique enough"
...
As described in Issue Report 844...
https://github.com/jasmine/jasmine/issues/844
...style rules in the app-being-tested may incidentally affect elements
in the Jasmine HTML Report container, as long as there is a chance that
the app-being-tested has CSS style rules for classes (or IDs) that
Jasmine uses.
This fix attempts to bring Jasmine to a state where each and every class
it uses always ends with "_jasmine-css" which should be unique enough to
ensure that CSS in the app-being-tested won't affect the Jasmine report,
because no app-being-tested is ever likely to use classes that end with
"_jasmine-css"
I'll be surpised if this commit is good enough as it is now, on the
first attempt to fix #844 , because of reasons I'll explain in either
the Issue or the Pull Request.
2015-05-13 18:55:44 -07:00
0b1449228f
Bump version to 2.3.4
2015-05-13 14:57:56 -07:00
65a6decd6d
Fix ordering for suites with more than 11 direct children.
...
- When no specs were focused, they all had the same precedence, and
`sort`ing them caused some of the nodes to move around
Fixes #850
2015-05-13 14:45:11 -07:00
7cbd86357d
Merge branch 'remove-dead-css' of https://github.com/prather-mcs/jasmine into prather-mcs-remove-dead-css
2015-05-13 11:03:25 -07:00
Gregg Van Hove