Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/0.21.6 #1389

Merged
merged 21 commits into from
Sep 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c8d36e5
Merge branch 'release/0.21.5' into develop
jmoody Apr 3, 2018
a6a023c
Adding sunsetting reminder to README.md
glennwester Apr 13, 2018
6821733
Merge pull request #1375 from calabash/sunsetting-readme
jmoody Apr 17, 2018
bc31187
CocoaPods: update spec to 0.21.5
jmoody Apr 17, 2018
b80668f
Rake: update podspec as part of server build
jmoody Apr 17, 2018
30dc1ce
Spec: remove dylibs inject test
polyakrecords May 16, 2018
936573a
Gem: remove frank related code and tests
polyakrecords May 15, 2018
33d4809
Merge pull request #1378 from calabash/feature/remove-frank
polyakrecords May 17, 2018
1444042
CI: add Jenkinfile; modify scripts for blue ocean pipeline
polyakrecords May 18, 2018
0216933
Test: add feature name for launching.feature
polyakrecords May 18, 2018
c976d21
CI: remove json reports
polyakrecords May 22, 2018
983d38c
Merge pull request #1379 from calabash/feature/Jenkins2
polyakrecords May 23, 2018
42c4dc7
Jenkins: change job name
jmoody May 25, 2018
0a6a7a3
Jenkins: timeout job after 30 minutes
jmoody Aug 2, 2018
8a69cf1
Gem: bump version to 0.21.6
AlexWellsHS Aug 15, 2018
280f23c
update run_loop dependency version
AlexWellsHS Aug 30, 2018
deb6224
update cocoapod version
AlexWellsHS Aug 30, 2018
f72a770
remove RunLoop::SimControl methods from quit_sim, calabash_sim_reset
AlexWellsHS Aug 30, 2018
4dff0a2
remove SimControl reference from spec resources
AlexWellsHS Aug 30, 2018
e2d974d
remove accessibility methods and callers
AlexWellsHS Aug 31, 2018
2995a64
update .irbrc SimControl references to Simctl
AlexWellsHS Aug 31, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 0.21.6

* Removed Frank related code and tests #1378
* Updated project for blue ocean CI #1379

### 0.21.5

This release requires a Calabash iOS Server update.
Expand Down
2 changes: 1 addition & 1 deletion Calabash.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Pod::Spec.new do |s|

s.name = 'Calabash'
s.version = '0.21.4'
s.version = '0.21.6'
s.license = { :type => 'Eclipse Public License 1.0', :text => <<-LICENSE
Calabash-ios Copyright (2016) Xamarin. All rights reserved.
The use and distribution terms for this software are covered by the
Expand Down
76 changes: 76 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#!/usr/bin/env groovy

pipeline {
agent { label 'master' }
environment {
DEVELOPER_DIR = '/Xcode/9.4.1/Xcode.app/Contents/Developer'

SLACK_COLOR_DANGER = '#E01563'
SLACK_COLOR_INFO = '#6ECADC'
SLACK_COLOR_WARNING = '#FFC300'
SLACK_COLOR_GOOD = '#3EB991'
PROJECT_NAME = 'Calabash iOS'
}
options {
disableConcurrentBuilds()
timestamps()
buildDiscarder(logRotator(numToKeepStr: '10'))
timeout(time: 30, unit: 'MINUTES')
}
stages {
stage('announce') {
steps {
slackSend(color: "${env.SLACK_COLOR_INFO}",
message: "${env.PROJECT_NAME} [${env.GIT_BRANCH}] #${env.BUILD_NUMBER} *Started* (<${env.BUILD_URL}|Open>)")
}
}
stage('prepare') {
parallel {
stage('calabash-cucumber bundle') {
steps {
sh 'cd calabash-cucumber; bundle update'
sh 'cd calabash-cucumber/test/cucumber; bundle update'
}
}
}
}
stage('rspec') {
steps {
sh 'bin/ci/jenkins/rspec.sh'
}
}
stage('cli') {
steps {
sh 'bin/ci/cli.sh'
}
}
stage('cucumber') {
steps {
sh 'cd calabash-cucumber/test/cucumber; ./run.sh'
}
}
}
post {
always {
junit 'calabash-cucumber/spec/reports/*.xml'
}

aborted {
echo "Sending 'aborted' message to Slack"
slackSend (color: "${env.SLACK_COLOR_WARNING}",
message: "${env.PROJECT_NAME} [${env.GIT_BRANCH}] #${env.BUILD_NUMBER} *Aborted* after ${currentBuild.durationString.replace('and counting', '')}(<${env.BUILD_URL}|Open>)")
}

failure {
echo "Sending 'failed' message to Slack"
slackSend (color: "${env.SLACK_COLOR_DANGER}",
message: "${env.PROJECT_NAME} [${env.GIT_BRANCH}] #${env.BUILD_NUMBER} *Failed* after ${currentBuild.durationString.replace('and counting', '')}(<${env.BUILD_URL}|Open>)")
}

success {
echo "Sending 'success' message to Slack"
slackSend (color: "${env.SLACK_COLOR_GOOD}",
message: "${env.PROJECT_NAME} [${env.GIT_BRANCH}] #${env.BUILD_NUMBER} *Success* after ${currentBuild.durationString.replace('and counting', '')}(<${env.BUILD_URL}|Open>)")
}
}
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

## Calabash iOS

>After delivering support for the final releases of iOS 11 and Android 8 operating systems, Microsoft will discontinue our contributions to developing Calabash, the open-source mobile app testing tool. We hope that the community will continue to fully adopt and maintain it. As part of our transition on the development of Calabash, we've provided an overview of mobile app UI and end-to-end testing frameworks as a starting point for teams who are looking to re-evaluate their testing strategy. Please see our [Mobile App Testing Frameworks Overview](https://docs.microsoft.com/en-us/appcenter/migration/test-cloud/frameworks) document.

[http://calaba.sh/](http://calaba.sh/)

Calabash is an automated testing technology for Android and iOS native and hybrid applications.
Expand Down
124 changes: 0 additions & 124 deletions README_FRANK.md

This file was deleted.

30 changes: 0 additions & 30 deletions bin/ci/install-keychain.sh

This file was deleted.

7 changes: 0 additions & 7 deletions bin/ci/jenkins/run.sh

This file was deleted.

1 change: 0 additions & 1 deletion bin/ci/travis/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ banner "Install Stubs for LPServer libs"

mkdir -p calabash-cucumber/staticlib
touch calabash-cucumber/staticlib/calabash.framework.zip
touch calabash-cucumber/staticlib/libFrankCalabash.a
mkdir -p calabash-cucumber/dylibs
touch calabash-cucumber/dylibs/libCalabashDyn.dylib
touch calabash-cucumber/dylibs/libCalabashDynSim.dylib
Expand Down
10 changes: 5 additions & 5 deletions calabash-cucumber/.irbrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require 'irb/completion'
require 'irb/ext/save-history'
require 'benchmark'
require 'calabash-cucumber'
require "run_loop"
require 'run_loop'
require 'command_runner'

AwesomePrint.irb!
Expand Down Expand Up @@ -45,7 +45,7 @@ puts ''
puts '# => Useful Methods <= #'
puts '> xcode => Xcode instance'
puts '> instruments => Instruments instance'
puts '> simcontrol => SimControl instance'
puts '> simctl => Simctl instance'
puts '> default_sim => Default simulator'
puts '> verbose => turn on DEBUG logging'
puts '> quiet => turn off DEBUG logging'
Expand All @@ -59,14 +59,14 @@ def instruments
@instruments ||= RunLoop::Instruments.new
end

def simcontrol
@simcontrol ||= RunLoop::SimControl.new
def simctl
@simctl ||= RunLoop::Simctl.new
end

def default_sim
@default_sim ||= lambda do
name = RunLoop::Core.default_simulator(xcode)
simcontrol.simulators.find do |sim|
simctl.simulators.find do |sim|
sim.instruments_identifier(xcode) == name
end
end.call
Expand Down
Loading