Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
a30d28b3
Commit
a30d28b3
authored
Sep 06, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Integration] Don't copare diff files if they are equal
parent
c7b67015
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
integration.rb
spec/integration.rb
+5
-0
No files found.
spec/integration.rb
View file @
a30d28b3
...
@@ -191,7 +191,9 @@ def yaml_should_match(expected, produced)
...
@@ -191,7 +191,9 @@ def yaml_should_match(expected, produced)
# Remove CocoaPods version
# Remove CocoaPods version
expected_yaml
.
delete
(
'COCOAPODS'
)
expected_yaml
.
delete
(
'COCOAPODS'
)
produced_yaml
.
delete
(
'COCOAPODS'
)
produced_yaml
.
delete
(
'COCOAPODS'
)
desc
=
[]
desc
=
[]
unless
expected_yaml
==
produced_yaml
desc
<<
"YAML comparison error `
#{
expected
}
`"
desc
<<
"YAML comparison error `
#{
expected
}
`"
desc
<<
(
"--- YAML DIFF "
<<
"-"
*
65
)
desc
<<
(
"--- YAML DIFF "
<<
"-"
*
65
)
...
@@ -212,6 +214,7 @@ def yaml_should_match(expected, produced)
...
@@ -212,6 +214,7 @@ def yaml_should_match(expected, produced)
diff
.
gsub!
(
"$expected"
,
"expected"
.
red
)
diff
.
gsub!
(
"$expected"
,
"expected"
.
red
)
desc
<<
diff
desc
<<
diff
desc
<<
(
"--- END "
<<
"-"
*
70
)
desc
<<
(
"--- END "
<<
"-"
*
70
)
end
expected_yaml
.
should
.
satisfy
(
desc
*
"
\n\n
"
)
do
expected_yaml
.
should
.
satisfy
(
desc
*
"
\n\n
"
)
do
if
RUBY_VERSION
<
"1.9"
if
RUBY_VERSION
<
"1.9"
...
@@ -255,6 +258,7 @@ end
...
@@ -255,6 +258,7 @@ end
def
file_should_match
(
expected
,
produced
)
def
file_should_match
(
expected
,
produced
)
is_equal
=
FileUtils
.
compare_file
(
expected
,
produced
)
is_equal
=
FileUtils
.
compare_file
(
expected
,
produced
)
description
=
[]
description
=
[]
unless
is_equal
description
<<
"File comparison error `
#{
expected
}
`"
description
<<
"File comparison error `
#{
expected
}
`"
description
<<
""
description
<<
""
description
<<
(
"--- DIFF "
<<
"-"
*
70
)
description
<<
(
"--- DIFF "
<<
"-"
*
70
)
...
@@ -267,6 +271,7 @@ def file_should_match(expected, produced)
...
@@ -267,6 +271,7 @@ def file_should_match(expected, produced)
end
end
description
<<
(
"--- END "
<<
"-"
*
70
)
description
<<
(
"--- END "
<<
"-"
*
70
)
description
<<
""
description
<<
""
end
is_equal
.
should
.
satisfy
(
description
*
"
\n
"
)
do
is_equal
.
should
.
satisfy
(
description
*
"
\n
"
)
do
is_equal
==
true
is_equal
==
true
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment