Kintsugi: Add integration tests. #66
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
byohay
commented
May 30, 2022
byohay
commented
- kintsugi.gemspec: Add git as development dependency.
- Add integration tests.
byohay
force-pushed
the
feature/add-integration-tests
branch
from
3f50c2c
to
c5eed4d
Compare
byohay
changed the title
ashdnazg
requested changes
Jun 1, 2022
kintsugi.gemspec
Outdated
| @@ -28,5 +28,7 @@ Gem::Specification.new do |spec| | |||
| spec.add_development_dependency "rspec", "~> 3.9" | |||
| spec.add_development_dependency "rubocop", "1.12.0" | |||
| spec.add_development_dependency "rubocop-rspec", "2.2.0" | |||
| spec.add_development_dependency "rubocop-performance", "1.13.3" | |||
spec/kintsugi_spec.rb
Outdated
| Kintsugi::run([File.join(project.path, "project.pbxproj")]) | ||
|
|
||
| project = Xcodeproj::Project.open(project_path) | ||
| expect(project.targets.count).to equal(2) |
There was a problem hiding this comment.
Suggested change
| expect(project.targets.count).to equal(2) | |
| expect(project.targets.map(&:display_name)).to contain_exactly("foo", "bar") |
spec/kintsugi_spec.rb
Outdated
|
|
||
| # Changes are supposed to be in `ours_project` after driver is called. | ||
| ours_project = Xcodeproj::Project.open(ours_project.path) | ||
| expect(Xcodeproj::Project.open(ours_project.path).targets.count).to equal(2) |
There was a problem hiding this comment.
Suggested change
| expect(Xcodeproj::Project.open(ours_project.path).targets.count).to equal(2) | |
| expect(ours_project.targets.map(&:display_name)).to contain_exactly("foo", "bar") |
spec/kintsugi_spec.rb
Outdated
| ours_project = Xcodeproj::Project.open(ours_project.path) | ||
| expect(Xcodeproj::Project.open(ours_project.path).targets.count).to equal(2) | ||
| end | ||
|
|
There was a problem hiding this comment.
add tests for errors - make sure the state of the folder in the end is what it should be.
If you can, also add tests for the driver
There was a problem hiding this comment.
Added a test that checks that after Kintsugi failed to resolve a conflict the project wasn't touched and is still has conflicts.
lib/kintsugi.rb
Outdated
| @@ -1,167 +1,49 @@ | |||
| # Copyright (c) 2021 Lightricks. All rights reserved. | |||
| # Created by Ben Yohay. | |||
| #!/usr/bin/env ruby | |||
byohay
force-pushed
the
feature/add-integration-tests
branch
2 times, most recently
from
2d97b16
to
c026462
Compare
|
@ashdnazg round done. |
byohay
force-pushed
the
feature/add-integration-tests
branch
8 times, most recently
from
d3aa28f
to
4c29371
Compare
ashdnazg
approved these changes
Jun 12, 2022
spec/kintsugi_integration_spec.rb
Outdated
| Kintsugi.run([File.join(project.path, "project.pbxproj")]) | ||
| }.to raise_error(Kintsugi::MergeError) | ||
| expect { | ||
| project = Xcodeproj::Project.open(project.path) |
There was a problem hiding this comment.
is this the best way to check if conflicts are kept?
Maybe just diff the file with the previous version?
byohay
force-pushed
the
feature/add-integration-tests
branch
from
4c29371
to
b5b30e7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.