Skip to content

Commit

Permalink
Added License file and fixed minor issues caused by the merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahmed Ali committed Jan 21, 2016
1 parent c57f597 commit 34c6186
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
60853A8C1C4ED7BD00806CD9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60853A8A1C4ED7BD00806CD9 /* LaunchScreen.storyboard */; };
60853AB11C4EE8BF00806CD9 /* Profile.m in Sources */ = {isa = PBXBuildFile; fileRef = 60853AB01C4EE8BF00806CD9 /* Profile.m */; };
60853AC11C4EF58D00806CD9 /* Activity.m in Sources */ = {isa = PBXBuildFile; fileRef = 60853AC01C4EF58D00806CD9 /* Activity.m */; };
609607711C51644D007C74C2 /* CCIExecution.m in Sources */ = {isa = PBXBuildFile; fileRef = 609607701C51644D007C74C2 /* CCIExecution.m */; };
CE8C0DCF38DAA6851B86EA19 /* libPods-CucumberishExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F96FF80F09F076CF8F3D23A0 /* libPods-CucumberishExampleTests.a */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -737,7 +736,6 @@
6075A5D81C4FB34400FE2B1B /* GHParserException.m in Sources */,
6075A5CC1C4FB34400FE2B1B /* GHExamples.m in Sources */,
6075A5C81C4FB34400FE2B1B /* GHComment.m in Sources */,
609607711C51644D007C74C2 /* CCIExecution.m in Sources */,
6075A5D01C4FB34400FE2B1B /* GHGherkinLanguageConstants.m in Sources */,
6075A5DD1C4FB34400FE2B1B /* GHStepArgument.m in Sources */,
6075A5DB1C4FB34400FE2B1B /* GHScenarioOutline.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ + (void)load
{
[CCIStepsUsingKIF setup];
KIFUITestActor * actor = [CCIStepsUsingKIF instance].actor;
Given(@"it is home screen", ^CCIExecutionResult *(NSArray *args, id userInfo) {
Given(@"it is home screen", ^void(NSArray *args, id userInfo) {
while ([actor isViewExistForAccessibilityLabel:@"Nav Back"]) {
[actor tapViewWithAccessibilityLabel:@"Nav Back"];
}
return [[CCIStepsUsingKIF instance] result];
});

And(@"all data cleared", ^CCIExecutionResult *(NSArray *args, id userInfo) {
And(@"all data cleared", ^void(NSArray *args, id userInfo) {
return step(@"I tap the \"Clear All Data\" button");
});

Expand Down
19 changes: 19 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2016 Ahmed Ali (https://github.com/Ahmed-Ali)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

0 comments on commit 34c6186

Please sign in to comment.