27 Commits

Author SHA1 Message Date
Wenyu Zhang
a3381717f7
Fix the bazel BUILD files and snapshot that were restored unintentionally.(#9983) 2020-04-29 11:00:00 -04:00
Randall Li
0100cfe414 [MDC-iOS/BottomSheet] Fix dismissOnDraggingDownSheet behavior
The bottom sheet incorrectly allowed the sheet to be drag dismissed when `dismissOnDraggingDownSheet` was set to NO.

This change permits the gesture to dismiss to begin but prevents it from actually closing the sheet.

https://github.com/material-components/material-components-ios/issues/9723

Closes https://github.com/material-components/material-components-ios/pull/9885

PiperOrigin-RevId: 307802500
2020-04-22 06:21:26 -07:00
Jeff Verkoeyen
c66fac8f81 Update .gitattributes to develop branch version.
PiperOrigin-RevId: 301368221
2020-03-17 10:25:59 -04:00
Nobody
dc8919a336 Project import generated by Copybara.
PiperOrigin-RevId: 301365828
2020-03-17 10:07:35 -04:00
Jeff Verkoeyen
0f466f6bd7 Revert .gitattributes to the develop branch behavior.
This file had previously been pointing to the `stable` branch behavior, but now that we are mirroring out to develop we want to use the `develop` behavior.

This fixes git lfs behavior so that snapshot tests can be committed to pull requests properly again.

PiperOrigin-RevId: 292365273
2020-01-30 09:40:17 -08:00
Nobody
70d9e228c7 Project import generated by Copybara.
PiperOrigin-RevId: 291912424
2020-01-28 08:49:51 -05:00
Yarden Eitan
0c350a24cd
Update .gitattributes 2019-10-08 15:45:59 -04:00
Yarden Eitan
742f7cf00c reverting .gitattributes change 2019-10-08 14:36:18 -04:00
Yarden Eitan
b126d3d3b5 reverting .gitattributes change 2019-10-08 14:35:07 -04:00
Andrew Overton
94d78658b9
Fix .gitattribuets (#8544)
This PR brings the correct version of .gitattributes to develop, similar to #8393 and #8478
2019-10-07 15:52:48 +02:00
randallli
916e3ae0e4 revert whitespace change to .gitattributes 2019-10-03 14:57:13 -04:00
randallli
77021e5ea7 manually reverting the .gitattributes file 2019-10-02 15:56:27 -04:00
Robert Moore
45609f6e6f
[Git LFS] Fix .gitattributes in develop. (#8478)
`.gitattributes` was accidentally merged back from `stable` to `develop`.

Prework for #8392
2019-09-23 11:08:47 -04:00
featherless
73db78d407 Revert .gitattributes. 2019-09-09 09:40:57 -04:00
Robert Moore
65ed88ed78
[Git LFS] Fix .gitattributes again. (#8393)
The merge strategy fix doesn't work, and it looks like `release-candidate` keeps
getting merged back into `develop`.

Required due to #8392
2019-09-04 14:36:19 -04:00
Robert Moore
5629721621 Revert "Fixing .gitattributes for develop"
This reverts commit d076fcef8d40ac4e6ae11b8406ba7ff8ff2843b4.
2019-08-26 09:41:01 -04:00
Robert Moore
d076fcef8d Fixing .gitattributes for develop 2019-08-21 08:55:07 -04:00
Robert Moore
de72e3c157 Revert .gitattributes 2019-08-19 12:20:53 -04:00
Robert Moore
e7cbd6171d
Fix .gitattributes. (#8321)
The merge from `stable` accidentally made it into `develop`. Once this is
fixed, and now that `stable` ignores merges, there should be no more
conflicts.

Follow-up to #8233
2019-08-15 15:39:08 -04:00
Robert Moore
ad0bfaf5bc
[Git LFS] Restore working .gitattributes file. (#8234)
The .gitattributes file should merge using a no-op merge operation during
releases. The process is documented in
https://github.com/material-components/material-components-ios/blob/develop/contributing/releasing.md#configure-the-merge-strategy-for-gitattributes
but was recently broken.

Closes #8233
2019-08-14 15:04:21 -04:00
Yarden Eitan
1bd9804824 comment out git lfs lines for stable 2019-08-06 10:50:18 -04:00
Wenyu Zhang
588764a598
Fix snapshots that were not stored on LFS. (#8221)
After fixing the lfs attribute in https://github.com/material-components/material-components-ios/pull/6350. We should turn git LFS back on to make sure new snapshots are stored on LFS. Snapshots committed after the change were not stored on LFS as a result. Because of it, some of our snapshots are stored on LFS, the rest are stored in binary file, which causes our build system is not able to run snapshot tests on those LFS snapshots.

This PR deletes all snapshot image binary files and adds them back in Git LFS file format. After turning the LFS back, Git is able to use LFS for our build/test system.

It also fixes https://github.com/material-components/material-components-ios/issues/8189.
2019-08-05 11:36:50 -04:00
Robert Moore
d1654fd43d
{Releasing} Exempt .gitattributes from merges. (#6350)
We have two different versions of `.gitattributes` in the `develop` and
`stable` branches. To avoid conflicts (or accidental merges) between the two
branches, we define a custom merge strategy just for that file.  During weekly
releases (or hotfixes), just after cloning the repository, the release
engineer should run this command:

    git config merge.gitattributes.driver true

Follow-up to #5956
2019-01-16 13:26:48 -05:00
Robert Moore
f747045a6d {Git-LFS} Exclude git-lfs from stable
Git LFS integration is only valuable for contributors. However, having the `.gitattributes` settings in the `stable` branch means it will propagate to clients attempting to integrate MaterialComponents via CocoaPods. If the client doesn't have git-lfs installed, then they only get arcane errors when attempting to update.

Fixes #5956
2018-12-11 15:07:06 -05:00
rami-a
615a0e4061
Snapshot Testing Proof of Concept (#5887)
* Snapshot Testing Proof of Concept (#5754)

### The problem
We currently do not have UI tests on a component level. Integrating snapshot tests would allow us to have peace of mind with each PR that it isn't going to introduce any changes to the UI unless its intended to.

### The solution
* Integrate `ios-snapshot-test-case` pod to handle generating and diffing images of components. 
* Integrate `git-lfs` to handle storage of the goldens.

This PR creates one test to showcase the ability to do snapshot tests. Upon merging this PR, you must install git-lfs in order to properly have the images pulled down. The 3 steps to do this:
1. `brew install git-lfs`
2. `git lfs install`
3. `git lfs pull`

Additionally, the golden is generated using an iOS 11 simulator at 2x scale so that the kokoro jobs are happy.

### Related bugs
Closes #5740

### Difference from #5754 
**Note:** This is a re-revert of #5754 that aims to fix issues with Travis CI by ensuring the snapshot test only runs on a single iOS version. I've opened #5888 to expand on this in the future. A few things changed in the approach in this PR:
 * We only run the snapshot test for iOS 11.2.0 until we can have an elegant solution for supporting multiple OS''s (see #5888)
 * The snapshot tests now live in their own test target to avoid issues with having to require an App host for all tests.
* Additionally, a dummy swift file was required for compilation of this new test target (see https://forums.developer.apple.com/thread/88451 for context)
2018-12-05 09:49:41 -05:00
Robert Moore
13781e6d45
[Catalog] Revert "Snapshot Testing Proof of Concept" (#5883)
Reverts material-components/material-components-ios#5754

Travis CI on `develop` branch testing has failed since snapshot testing was introduced. Rolling it back.

https://travis-ci.org/material-components/material-components-ios/builds
2018-11-30 09:20:03 -05:00
rami-a
c6a300ff2c
Snapshot Testing Proof of Concept (#5754)
### The problem
We currently do not have UI tests on a component level. Integrating snapshot tests would allow us to have peace of mind with each PR that it isn't going to introduce any changes to the UI unless its intended to.

### The solution
* Integrate `ios-snapshot-test-case` pod to handle generating and diffing images of components. 
* Integrate `git-lfs` to handle storage of the goldens.

This PR creates one test to showcase the ability to do snapshot tests. Upon merging this PR, you must install git-lfs in order to properly have the images pulled down. The 3 steps to do this:
1. `brew install git-lfs`
2. `git lfs install`
3. `git lfs pull`

Additionally, the golden is generated using an iOS 11 simulator at 2x scale so that the kokoro jobs are happy.

### Related bugs
Closes #5740
2018-11-29 15:56:06 -05:00