Skip to content
This repository was archived by the owner on Aug 8, 2022. It is now read-only.

Commit 28e1bf9

Browse files
authored
Merge pull request #261 from Shopify/update-master-refs
Update references of master to main
2 parents 6a04294 + c1af003 commit 28e1bf9

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Resolves <issues>
1111

1212
### Notice
1313

14-
This change must keep `master` in a shippable state; **it may be shipped without further notice**.
14+
This change must keep `main` in a shippable state; **it may be shipped without further notice**.
1515

1616
<!--
17-
Need help in filling this out? See the [guide](https://github.com/Shopify/android-testify/blob/master/CONTRIBUTING.md).
17+
Need help in filling this out? See the [guide](https://github.com/Shopify/android-testify/blob/main/CONTRIBUTING.md).
1818
-->

.github/stale-flagger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# Number of commits between the PR and master from which we should block the merges
1+
# Number of commits between the PR and main from which we should block the merges
22
threshold: 40

.github/workflows/intellij_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
# If accepted and published, release workflow would be triggered
162162
releaseDraft:
163163
name: Release Draft
164-
if: github.ref == 'refs/heads/master'
164+
if: github.ref == 'refs/heads/main'
165165
needs: [build, verify]
166166
runs-on: ubuntu-latest
167167
steps:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
## Workflow
1616

17-
* Fork the repo and branch off of `master`
17+
* Fork the repo and branch off of `main`
1818
* Create a new branch in your fork
1919
* Add tests for your code
2020
* Make sure all tests pass

PUBLISHING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
Testify is published to the Maven Central Repository via GitHub Actions.
44

5-
- Update the `testify` version in [build.gradle](https://github.com/Shopify/android-testify/blob/master/build.gradle#L33) and commit the version bump
5+
- Update the `testify` version in [build.gradle](https://github.com/Shopify/android-testify/blob/main/build.gradle#L33) and commit the version bump
66
- Create a new release on Github. This will invoke the publish Github action and automatically build, sign, and upload to the OSSRH staging repository.
77
- Promotion from OSSRH to Central Repository requires a manual review for validation before becoming publicly available

Plugins/Gradle/src/main/kotlin/com/shopify/testify/internal/ImageDiff.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import java.io.File
2929

3030
private fun generateDiff(sourceFile: File, diffFile: String) {
3131
print(" Extracting differences for ${sourceFile.nameWithoutExtension}")
32-
val baselineFile = File("${sourceFile.parent}/master-${sourceFile.name}")
32+
val baselineFile = File("${sourceFile.parent}/main-${sourceFile.name}")
3333
print(".")
3434

3535
Git.fetchOriginal(sourceFile, baselineFile)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Add screenshots to your Android tests
44

5-
<a href="https://github.com/Shopify/android-testify/actions?query=workflow%3A%22Build+Gradle+Plugin%22"><img alt="GitHub Actions" src="https://github.com/Shopify/android-testify/workflows/Build%20Gradle%20Plugin/badge.svg?branch=master"/></a> <a href="https://search.maven.org/artifact/com.shopify.testify/testify"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.shopify.testify/testify?color=%236e40ed&label=com.shopify.testify%3Atestify"/></a> <a href="https://search.maven.org/artifact/com.shopify.testify/plugin"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.shopify.testify/plugin?color=%234da1ea&label=com.shopify.testify%3Aplugin"/></a>
5+
<a href="https://github.com/Shopify/android-testify/actions?query=workflow%3A%22Build+Gradle+Plugin%22"><img alt="GitHub Actions" src="https://github.com/Shopify/android-testify/workflows/Build%20Gradle%20Plugin/badge.svg?branch=main"/></a> <a href="https://search.maven.org/artifact/com.shopify.testify/testify"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.shopify.testify/testify?color=%236e40ed&label=com.shopify.testify%3Atestify"/></a> <a href="https://search.maven.org/artifact/com.shopify.testify/plugin"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.shopify.testify/plugin?color=%234da1ea&label=com.shopify.testify%3Aplugin"/></a>
66
---
77

88
Expand your test coverage by including the View-layer. Testify allows you to easily set up a variety of screenshot tests in your application. Capturing a screenshot of your view gives you a new tool for monitoring the quality of your UI experience. It's also an easy way to review changes to your UI. Once you've established a comprehensive set of screenshots for your application, you can use them as a "visual dictionary". In this case, a picture really is worth a thousand words; it's easy to catch unintended changes in your view rendering by watching for differences in your captured images.

RECIPES.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ Using `ScreenshotRule.setScreenshotViewProvider`, you myst return a `View` refer
4545

4646
It is often desirable to test your View or Activity in multiple locales. Testify allows you to dynamically change the locale on a per-test basis.
4747

48-
To begin, if you are targeting an emulator running Android API 24 or higher, your activity under test must implement the [TestifyResourcesOverride](https://github.com/Shopify/android-testify/blob/master/Library/src/main/java/com/shopify/testify/resources/TestifyResourcesOverride.kt) interface. This allows Testify to attach a new `Context` with the appropriate locale loaded. It is highly recommended that you employ a _test harness activity_ for this purpose. Please see the [TestHarnessActivity](https://github.com/Shopify/android-testify/blob/master/Sample/src/androidTest/java/com/shopify/testify/sample/test/TestLocaleHarnessActivity.kt) in the provided Sample.
48+
To begin, if you are targeting an emulator running Android API 24 or higher, your activity under test must implement the [TestifyResourcesOverride](https://github.com/Shopify/android-testify/blob/main/Library/src/main/java/com/shopify/testify/resources/TestifyResourcesOverride.kt) interface. This allows Testify to attach a new `Context` with the appropriate locale loaded. It is highly recommended that you employ a _test harness activity_ for this purpose. Please see the [TestHarnessActivity](https://github.com/Shopify/android-testify/blob/main/Sample/src/androidTest/java/com/shopify/testify/sample/test/TestLocaleHarnessActivity.kt) in the provided Sample.
4949

50-
With an Activity which implements `TestifyResourcesOverride`, you can now invoke the [setLocale](https://github.com/Shopify/android-testify/blob/master/Library/src/main/java/com/shopify/testify/ScreenshotRule.kt#L205) method on the `ScreenshotTestRule`. `setLocale` accepts any valid [Locale](https://docs.oracle.com/javase/7/docs/api/java/util/Locale.html) instance.
50+
With an Activity which implements `TestifyResourcesOverride`, you can now invoke the [setLocale](https://github.com/Shopify/android-testify/blob/main/Library/src/main/java/com/shopify/testify/ScreenshotRule.kt#L205) method on the `ScreenshotTestRule`. `setLocale` accepts any valid [Locale](https://docs.oracle.com/javase/7/docs/api/java/util/Locale.html) instance.
5151

5252
_Example Test:_
5353
```kotlin
@@ -333,7 +333,7 @@ The three capture methods available are:
333333
For legacy compatibility reasons, `DrawingCache` mode is the default Testify capture method.
334334

335335
If you wish to select an alternative capture method, you can enable the experimental feature either in code, or in your manifest.
336-
Available features can be found in [TestifyFeatures](https://github.com/Shopify/android-testify/blob/master/Library/src/main/java/com/shopify/testify/TestifyFeatures.kt#L10)
336+
Available features can be found in [TestifyFeatures](https://github.com/Shopify/android-testify/blob/main/Library/src/main/java/com/shopify/testify/TestifyFeatures.kt#L10)
337337

338338
**Code:**
339339
```kotlin

0 commit comments

Comments
 (0)