Permalink
Browse files

Merge branch 'master' of github.com:kiwi-bdd/Kiwi

Conflicts:
	Readme.md
  • Loading branch information...
allending committed May 18, 2014
2 parents b9d2dbb + 381b18c commit 4c5e26cab5a20610a3cee4181156a7689d12eb29
Showing with 7 additions and 6 deletions.
  1. +1 −1 .travis.yml
  2. +6 −5 Readme.md
View
@@ -1,5 +1,5 @@
language: objective-c
before_install:
- gem install xcpretty
-script: make ci | xcpretty -c
+script: make ci | xcpretty -c && exit ${PIPESTATUS[0]}
View
@@ -2,12 +2,12 @@
## Kiwi has moved to the kiwi-bdd organization here: (https://github.com/kiwi-bdd/Kiwi). Please go there. allending/Kiwi is now a personal fork used to submit PRs.
-[![Build Status](https://travis-ci.org/allending/Kiwi.svg?branch=master)](https://travis-ci.org/allending/Kiwi)
+[![Build Status](https://travis-ci.org/kiwi-bdd/Kiwi.svg?branch=master)](https://travis-ci.org/kiwi-bdd/Kiwi)
Kiwi is a Behavior Driven Development library for iOS development.
The goal is to provide a BDD library that is exquisitely simple to setup and use.
-# Why? #
+## Why?
The idea behind Kiwi is to have tests that are more readable than what is possible with the bundled test framework.
Tests (or rather specs) are written in Objective-C and run within the comfort of Xcode to provide a test environment that is as unobtrusive and seamless as possible in terms of running tests and error reporting.
@@ -30,12 +30,13 @@ describe(@"Team", ^{
});
```
-# Documentation #
+## Documentation
The [Kiwi Wiki](https://github.com/kiwi-bdd/Kiwi/wiki) is the official documentation source.
-# Getting it #
+## Getting it
The best way to get Kiwi is by using [CocoaPods](https://github.com/cocoapods/cocoapods).
For all the installation details, check out the [Wiki](https://github.com/kiwi-bdd/Kiwi/wiki)
-# Support #
+## Support
For all the questions / suggestions you have, that aren't bug reports please use our [Google Group](https://groups.google.com/forum/#!forum/kiwi-bdd)
+

0 comments on commit 4c5e26c

Please sign in to comment.